903729d5c9
Merge. Refresh from viewer-release after 3.7.9 release.
2014-06-16 16:41:52 -04:00
e15002a11c
merge changes for 3.7.9-release
2014-06-16 11:42:37 -04:00
2ccbef39a6
All: Update openssl to 1.0.1h/290662, curl to 290664, llqtwebkit to 290663.
...
Linux: Include libQtXml and libQtSvg in manifest for libqsvg.so.
More documentation thoughts for library package structure.
2014-06-05 18:37:24 -04:00
5b542e227b
All: Committing to llqtwebkit2 and the future. Updating all libraries.
...
Updating SDL to 290561, c-ares to 290399, Boost to 290566, colladadom
to 290576, curl to 290567, fontconfig to 290569, freetype to 290557,
google-mock to 290574, libpng to 290558, libxml2 to 290562, llqtwebkit
to 290578, openssl to 290560, PCRE to 290406, zlib to 290556. Document
compiling and linking in new 00-COMPILE-LINK-RUN.txt in indra/cmake. It
is the README for the building process based on things learned during
this library project. Switch building process back to style used for
new llqtwebkit2 repo. This builds shared libraries for Qt4 products
on all platforms using current build machines and TC task templates.
All platforms are building. All have comparable FPS rates. Builds are
getting quieter. Forward, comrades!
2014-06-03 19:37:58 -04:00
71eb87d0a5
Windows/Mac: Update llqtwebkit to 290262. Simple rebuild of library with
...
package dependencies updated.
2014-05-28 19:44:27 +00:00
403ec62e3c
All: Update library SDL to 290309, c-ares to 290089, boost to 290191,
...
colladadom to 290229, curl to 290186, fontconfig to 290258, freetype to 290255,
google-mock/gmock/gtest to 290199, libpng to 290081, libxml2 to 290157,
llqtwebkit to 290262/250147 (to be fixed shortly), openssl to 290083,
pcre to 290150, zlib to 290080. The freetype2 headers are now normalized
to what they would normally be on a unix-type system. Libxml2 and
pcre are available on all platforms. Libraries generally move in the
direction of static archives rather than shared libraries (e.g. openssl).
The llqtwebkit side is a step back from the more ambitious goal. What
will be used (290262) will be a simple rebuild of the existing 4.7.1
library with updated package dependencies. The bigger work will be in
the future.
2014-05-28 19:40:45 +00:00
060c728970
Merge. Pull in viewer-release after release of 3.7.8
2014-05-22 22:08:54 +00:00
d0d32626a5
merge fix for merge with project interesting. New appearance utility source and one quick doubly-declared typedef.
2014-05-19 14:44:01 -04:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
b4ca93cadc
merge up to 3.7.6-release
2014-04-22 13:05:26 -04:00
d0eb9658f2
merge
2014-04-22 11:19:58 -04:00
f8874d04b8
Linux/Win: Bad checksum on Windows package. Libz and libpng linking changes to find newest code.
...
Windows autobuild package had a bad checksum due to oddities in the build
system. On Linux I've been fighting with getting libz 1.2.8 and libpng
1.6.8 to be the definitive version in the viewer. Problem is the *massive*
library search tree we assemble. We find older shared library versions
first and so those dominated. By using --whole-archive with static libraries,
the packaged versions of these libraries are made definitive.
2014-04-15 22:48:52 +00:00
04404b68b5
All/Mac: Update libraries to new template builds. Package for static libz/libpng/openssl.
...
Update library dependencies to reference builds using new templates and
modern build hosts for: SDL, c-ares, boost, curl, libpng, llqtwebkit2,
openssl and zlib. Update manifest, library copying and 'test_apps' setup
to reflect that zlib and openssl are now always static (on Mac and
Linux). Viewer and test_apps now functional on 10.7 Mac.
2014-04-14 17:59:00 -04:00
e72d546fe3
Mac: Update llqtwebkit build, build and package dylib Qt4 pieces.
...
Part of the switchover to dynamic Qt4. This mostly completes the
Mac side. Webkit is functional on Mac, plugins work. The two
test programs, llfbconnectest and llplugintest, need a little
more work to run without manual fixup ('.' on PATH and maybe a
symlink to libz.1.dylib and they run and function on Mac). Also
need to address libz.dylib vs libz.a. Currently resolving against
dylib which is not what I want.
2014-04-11 19:19:22 -04:00
6631dc22f0
All/Linux: Update llqtwebkit to latest all-shared lib build. Linux package
...
assembly updated to deal with Qt libraries and discrete codec and imageformat
plugins (which live under bin/llplugin). Functioning Linux viewer with MoaP
support with a few image problems (sRGB profile, zlib errors). Much of this
expected to be due to the new 1.6.8/1.2.8 libpng/libz and we'll fix as needed.
2014-04-09 21:05:55 +00:00
ea7f34d37a
merge
2014-04-08 13:20:23 -04:00
375c05ac43
merge changes for 3.7.5-release
2014-04-08 11:41:12 -04:00
98aabdc176
merge with release
2014-04-07 19:09:40 -07:00
d476b12ae5
Merged viewer release into vivox
2014-04-07 17:04:09 -07:00
20c963b42e
All: Update curl and llqtwebkit2 packages to new template builds.
2014-04-07 20:04:15 +00:00
30eb6d13f5
Linux/Mac: Update to latest OpenSSL 1.0.1e build. Fix manifest for
...
openssl on Mac (copy, deploy). Revert Linux manifest work which tried
to work around 0555 permissions on .sos (and didn't work).
2014-04-07 14:01:34 -04:00
469438707d
Library updates and switch to 3d-llqtwebkit2 build products.
...
SDL to 1.2.15, c-ares to latest 1.10.0 build, Boost to 1.55.0
with coroutine updates/fixes, curl to 7.34.0, libpng to 1.6.8,
openssl to 1.0.1e, zlib to latest 1.2.8 build, llqtwebkit
built from 4.7.1 sources refactored and tested in 3p-llqtwebkit2
repository.
Windows is functional with a good number of warning messages
at runtime from libpng and KDU. MoaP/slplugin functioning.
2014-04-04 16:30:50 -04:00
d7481cd07c
Merge. Refresh from viewer-release after 3.7.4 release.
2014-04-03 18:56:46 -04:00
d10ecef615
merge
2014-03-31 11:59:11 -04:00
dfd78e83d9
Pulled merge from release
2014-03-27 11:59:35 -07:00
e5bbdafded
merge with release
2014-03-24 19:23:34 -07:00
77ec712b15
Merged in viewer-release.
2014-03-24 11:30:17 -07:00
1e764fb668
Consistent set of fmodex 4.44.31 builds now.
2014-03-14 21:14:32 -04:00
4f565ed077
Update fmodex to 4.44.31. Move DSP descriptor to heap storage.
2014-03-14 19:48:35 -04:00
22ea5ac41c
BUG-4260 Updated to 4.6.x vivox libraries for Mac and Windows.
2014-02-26 20:15:45 -08:00
1d30fe9554
merge changes for 3.7.2-release
2014-02-25 13:31:01 -05:00
895d52a399
merge viewer-release to sunshine-external
2014-02-25 13:25:40 -05:00
80b4a4a1f5
merge with release
2014-02-24 18:45:59 -08:00
8fd270af1c
Pulled from release.
2014-02-24 15:12:04 -08:00
6809348125
Creating a cleaner branch
2013-12-03 17:06:06 -08:00
7f39d0472e
merge changes for STORM-1831
2013-11-18 13:51:24 -05:00
d191585a3e
Merge. Refresh from viewer-release after 3.6.10 release
2013-11-12 14:06:38 -05:00
33e0a1b57f
updated autobuild llappearanceutilitysource to point to official build
2013-11-08 21:18:29 -08:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
076761a03d
Update libpng after fixing arch under which it was built.
2013-11-04 22:52:53 +00:00
460d01befb
Update build plumbing with tier 2, 3 and 4 libraries
2013-11-01 23:32:44 +00:00
7866356d77
Merge viewer-release => sunshine-internal
2013-10-29 13:20:18 +00:00
b1838f02bc
SH-4572 FIX changing clothing parameters do not take effect in edit appearance
...
fix, new back-end utility and restoring the necessary functionality.
2013-10-25 16:43:36 -04:00
ab43be5ddb
moved some common functionality from LLTrace::BlockTimerStatHandle to BlockTimer
...
updates appearance utility dependency
2013-10-23 13:24:47 -07:00
e06ad3d60f
updated appearance utility dependency
2013-10-23 09:49:29 -07:00
30f835809b
Merge 3.5.8-release
2013-10-21 04:21:00 +01:00
4027486dbb
storm-1831 Incorporating Oz's changes to update libxml on linux to libxml2
2013-10-18 17:38:31 +01:00
b42c70173c
SH-3455 BUILDFIX Updating linux appearance utility to use the new refactor
...
Eliminated some unnecessary functions that the refactor took care of,
linux build should be fixed.
2013-10-16 15:28:10 -04:00
1f8b37e9ad
merge
2013-10-16 11:52:43 -04:00
9c313aea13
merge changes for DRTVWR-336
2013-10-15 17:47:37 -04:00
015597bb58
STORM-1831 Importing Oz's updates for libxml2
2013-10-12 03:07:22 +01:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
eaef5e63d5
Merge. Pull in viewer-release after materials viewer release.
2013-09-19 13:13:37 -04:00
91850b6cfa
updated autobuild reference to llappearance-utility
2013-09-09 16:28:44 -07:00
8dc273b942
correct some doc strings in the autobuild config file
2013-09-05 15:18:58 -04:00
f00b6c7133
Merge. Pull in viewer-release after SSA merge.
2013-08-26 18:54:39 -04:00
a45806e17c
Okay, move openssl back to the weird 0.9.8/1.0.0 mix it was
...
before. Move libcurl forward to 7.24.0 and built on 0.9.8.
Until we do some TC work, we may be stuck with this combo.
2013-08-26 15:35:34 -04:00
912995de62
Moved OpenSSL to 1.0.1e as an experiement. Can't build llqtwebkit
...
so that doesn't move. 3p-curl does, however, and this gets them
all. I suspect I'll be backing down to 0.9.8 next week.
2013-08-23 20:41:01 -04:00
cb8c94cc88
updated appearance utility source
2013-08-23 16:27:39 -07:00
0d1850ef0b
updated appearance utility source
2013-08-23 15:53:18 -07:00
c4cda389af
Okay, move openssl back to 0.9.8q as we have compiler issues
...
on the build farm. This, at least, gets us through the openssl->
libcurl->viewer dependency chain.
2013-08-22 19:48:45 -04:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
cc999b225e
merge cleanup, making sure our branch has the latest autobuild changes.
2013-08-19 11:55:49 -04:00
faa0866ca3
SH-4401 FIX back-end changes to handle new visual param groups.
2013-08-08 13:21:18 -04:00
629bda7cf3
merge changes for 3.6.2-release
2013-08-05 15:27:05 -04:00
32b8d398ec
increment viewer version to 3.6.3
2013-08-05 14:42:37 -04:00
df5dff372b
BUIDLFIX: point to fixed build of llappearanceutilities
2013-07-31 14:43:44 -07:00
247a5a15d6
BUIDLFIX: point to fixed build of llappearanceutilities
2013-07-31 12:21:49 -07:00
f496361568
BUILDFIX: point at newest version of llappearanceutility
2013-07-22 15:24:45 -07:00
ce9962b338
Merged in viewer-release
2013-07-11 17:49:13 -07:00
6c440d1b51
remove command line option that causes warning messages
2013-07-03 09:15:33 -04:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
1236c920ea
BUIDLFIX: point to updated version of llappearanceutility-source
2013-06-19 19:55:31 -07:00
d847b9dc3f
Can't use bash local keyword outside of functions.
2013-06-06 19:42:22 -04:00
36812775a4
Updated llappearance-utility-source autobuild package to latest and changed debian changelog mangling to include codeticket number.
2013-06-06 18:53:06 -04:00
613b949e2f
BUILDFIX: pointed autobuild at updated llappearanceutilities
2013-06-06 15:28:59 -07:00
a07cee746c
Updated to latest llappearanceutility
2013-06-05 17:34:25 -04:00
3340eb8c71
Updated to latest llappearanceutility package
2013-06-05 10:46:12 -04:00
74ea01d6f2
merge changes for maint-2718
2013-05-22 14:40:26 -04:00
1d8b9ff07c
MAINT-2718 FIX Update Windows version of FMOD Ex DLLs with non-logging versions
2013-05-21 21:38:09 -07:00
a04a706c1b
merge
2013-05-21 16:18:48 -04:00
c96b8281a9
Thanks mercurial.
2013-05-15 20:56:51 -07:00
e1c1428569
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
2013-05-11 20:38:23 -07:00
7ff4d16041
Updating appearance utility
2013-05-11 08:28:40 +00:00
5bb540ddbf
Updating appearance utility
2013-05-11 04:12:31 +00:00
6074f65991
Merge with vwr-dev-mat
2013-05-10 10:34:26 -07:00
4d22c32aa9
merge changes for 3.5.2-beta4
2013-05-10 10:56:40 -04:00
1b984d8f40
merge changes for 3.5.1-release
2013-05-08 14:46:00 -04:00
545e033d1e
merge changes for DRTVWR-299
2013-05-07 15:11:55 -04:00
c9aae997a0
LLAppearance package update
2013-05-06 10:43:18 -04:00
0ef6ca8879
Updated llappearanceutility-source package.
2013-05-03 19:57:40 -04:00
be008638aa
Updated appearance package
2013-05-03 14:37:06 -05:00
f3cc77377a
Updated appearance util.
2013-05-03 12:17:43 -04:00
7e599539f0
LLAppearance package update
2013-05-01 16:58:02 -04:00
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
c198d9db81
LLAppearance package update
2013-04-26 15:55:39 -05:00
2c617e0beb
llappearance package update
2013-04-26 14:33:49 -05:00
Monty Brandenberg