3444d77609
merge changes for storm-1388
2011-06-17 17:34:27 -04:00
796624d947
STORM-1320 OPEN-21 STORM-312 Update libndofdev on linux. Fixes spacenavigator.
2011-06-17 13:07:14 -04:00
0b92d52d78
fix for SH-1412: Mesh upload dialog freezes viewer when uploading certain meshes.
2011-06-13 11:52:50 -06:00
bdf34c2fbf
Automated merge with https://bitbucket.org/davep/mesh-asset-deprecation
2011-06-07 18:24:04 -06:00
dfdf6aed23
fix for SH-1765: palm tree model fails to load in viewer
2011-06-07 18:22:09 -06:00
f1784209d5
merge
2011-06-07 14:42:54 -05:00
a3842d9637
fix for SH-588: Uploading a mesh crashes viewer
2011-06-06 23:04:48 -06:00
960e8c05cb
Automated merge with http://hg.secondlife.com/viewer-development
2011-06-02 13:35:15 -07:00
4cd295badd
Updated links to new version of LLQtWebKit package for Mac with valid exports file.
...
Addition of Windows version for completenes. No changes.
2011-05-26 12:42:19 -07:00
2595d53ded
Automated merge with http://hg.secondlife.com/viewer-development
2011-05-25 18:14:55 -07:00
ae6ceb6193
Point to updated version of LLQtWebKit that supports local changes.,
2011-05-25 10:19:00 -07:00
781addcbc1
Automated merge up from viewer-development into mesh-development
2011-05-20 11:41:28 -04:00
b1803a8cb9
fix for SH-1185: uploading large mesh file sometimes fails and locks up viewer.
2011-05-19 17:25:42 -06:00
42654e759e
Replace older (but working) reference to version of LLQtWebKit for Linux
2011-05-17 17:47:06 -07:00
9075e1104f
fix merge error in open source configurations to disable proprietary components
2011-05-17 19:26:18 -04:00
bd37b14e92
BUILDFIX: copy/paste error in mesh autobuild.xml causes configure to fail.
...
copy/paste error in autobuild.xml caused INSTALL_PROPRIETARY to be set to TRUE
for OS builds. This causes configure to fail as llconvexdecomposition is not
available to OS devs. Changing INSTALL_PROPRIETARY to false for OS devs so
that llconvexdecompositionstub is used instead. problem only affects windows
builds.
2011-05-17 17:25:38 -04:00
465072626e
Typo in Mac/Darwin LLQtWebkit archive name
2011-05-17 10:05:49 -07:00
d2c697832f
Point to updated (working) builds of LLQtWebKit.
...
Windows one was missing debug libs/dlls
Mac one was missing updated exports.
Linux one included for completeness.
2011-05-17 09:31:43 -07:00
8a92612fd9
merge
2011-05-16 12:34:15 -05:00
889f6cc3b3
Merge with tip
2011-05-13 17:09:40 -07:00
e4a9704d41
EXP-676 FIX As a web developer, I want to access information about the current state of the SL client, such as avatar location
2011-05-13 17:08:43 -07:00
93696ac019
merge
2011-05-12 17:39:08 -05:00
f7a01d7b33
Merge.
2011-05-12 17:08:20 -07:00
7be1755d61
merge changes for VWR-25727
2011-05-11 08:39:54 -04:00
32bce75124
New build of ogg-vorbis package to fix VWR-25727.
2011-05-10 17:22:34 -07:00
2661a4c2c9
Merge.
2011-05-09 11:26:24 -07:00
343ffb9d51
Remove Pth library from viewer build.
...
This library was only needed on the Mac, and only with the OS X 10.4 SDK. As
of October 2010, we no longer build the viewer with that SDK. The 10.5 SDK
we're currently using directly supports the functionality for which we
originally brought in Pth.
2011-05-05 19:23:55 -04:00
8245e381cb
STORM-1210 Make llconvexdecomposition private
2011-05-04 12:54:07 -05:00
5eed546adf
STORM-1210 Public URLs for pcre
2011-05-04 12:45:40 -05:00
36c671cf15
STORM-1210 Update PCRE libs for mac and linux.
2011-05-04 12:12:42 -05:00
a8ba89eb41
Fix for CHOP-619. Found a general solution to our vs2010 precompiled headers problems and eliminated all our special cases for handling them.
2011-05-03 18:15:00 -07:00
a25f898703
merge
2011-05-02 14:52:12 -05:00
1cfe556769
STORM-1215: restore INSTALL_PROPRIETARY in Release builds, remove incorrect use of LL_RELEASE_FOR_DOWNLOAD from ReleaseOS
2011-05-02 09:25:08 -04:00
67be82ad37
updated llconvexdecomposition for version linked with vs2010 havok
2011-04-28 11:00:27 -04:00
e6bd982c00
OPEN-50 : backing out that change that is incompatible with Incredibuild.
2011-04-27 10:47:41 -07:00
764412f9b5
merge
2011-04-22 11:50:19 -05:00
0349d1f291
Update convex decomp stub to include latest api changes.
2011-04-22 01:17:19 -05:00
33eb030bc0
Update llconvexdecompositionstub for new package layout.
2011-04-22 00:05:04 -05:00
f5c4c89a44
Automated merge with https://hg.secondlife.com/mesh-development
2011-04-21 18:07:36 -04:00
ac40560782
reversing the elimination of the stub build of convexdecomp, as we still need
...
the binary version, even with the full LL source being available. This is because
the binary package of the full version is not redistributable due to having the
havok binaries in it.
2011-04-21 18:07:31 -04:00
62208046ae
merge
2011-04-21 16:37:03 -05:00
58b48137ca
Touch up autobuild xml from merge.
2011-04-21 16:35:09 -05:00
19857d0cf0
merge
2011-04-21 16:23:00 -05:00
a4decda79b
explicitly enable INSTALL_PROPRIETARY in the Linden configurations
2011-04-21 16:40:16 -04:00
a604bc27e5
restore use of proprietary libs (merge error) in Release builds
2011-04-21 10:12:36 -04:00
120f31502e
merge changes for storm-1183
2011-04-20 20:22:54 -04:00
a357815604
update the collada lib of Mac to the rev 227230 to fix the missed minizip problem.
2011-04-20 18:10:33 -06:00
c7721b86c6
New openssl package solves permissions problems with Linux build.
...
The original Linux openssl tarball includes libcrypto.so and libssl.so files
with r-xr-xr-x permissions: not even the owning user can modify them. This
causes problems when the Release build tries to 'strip' the viewer and all
associated libraries. Newer openssl tarball fixes permission problems.
The newer openssl package also updates from 0.9.8 to 1.0.0, so have to fix
version numbers in Copy3rdPartyLibs.cmake and viewer_manifest.py too. :-P
Presumably the only reason this hasn't been causing trouble with TC builds is
that the link has been picking up system libraries instead of the ones from
the openssl package.
2011-04-19 21:43:13 -04:00
2866e1d9e1
Update freetype package: previous one had no actual library.
...
Evidently the only reason builds have been succeeding is because the link is
picking up the system freetype library. This could be tricky if it goes out of
sync with the freetype package's header files.
2011-04-19 21:32:10 -04:00
17a70ddf8f
merge
2011-04-15 17:12:42 -04:00
Oz Linden