Commit Graph

275 Commits (3ce04f335e640ef9a00b00aae94ef2de841a1f7b)

Author SHA1 Message Date
Xiaohong Bao a9600e5e0d fix for SH-1808: uploading warthog model triggers LLPhysicsDecomp::doDecompositionSingleHull warnings
SH-1333: [PUBLIC] Simple mesh causing the viewer to crash
2011-07-07 10:51:13 -06:00
Brad Payne (Vir Linden) 961d5b1d65 merge 2011-07-09 11:05:29 -04:00
Richard Linden 88a90aabcb Automated merge with http://hg.secondlife.com/viewer-development 2011-07-07 13:34:13 -07:00
Xiaohong Bao 0400143b4d fix for SH-1808: uploading warthog model triggers LLPhysicsDecomp::doDecompositionSingleHull warnings
SH-1333: [PUBLIC] Simple mesh causing the viewer to crash
2011-07-07 10:51:13 -06:00
prep linden e2ddeb5e5f Fix for SH-1604: missing convex stub license 2011-07-05 13:27:58 -04:00
Brad Payne (Vir Linden) 4bce553a96 merge viewer-development -> mesh-development 2011-07-01 09:41:10 -04:00
Oz Linden b5001ff819 merge changes for storm-1368 2011-06-29 21:20:30 -04:00
Aaron Stone 06e18dd44d STORM-1447 Use <filters>setenv</> stanza rather than grep -v setenv. 2011-06-27 12:43:46 -07:00
Richard Linden af142618f9 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-06-23 11:35:14 -07:00
Richard Linden 70fc5af53f Automated merge with http://hg.secondlife.com/viewer-development 2011-06-23 11:28:23 -07:00
Brad Payne (Vir Linden) 2da45d0237 merge 2011-06-22 13:36:17 -04:00
Nyx (Neal Orman) e029683826 SH-1476 FIX viewer crashes uploading on linux
colladadom was configured to depend on a system library that may not be
up to date on all user's machines. Changed configuration to link statically
against a known version. Verified locally crash does not reproduce.
2011-06-21 18:06:47 -04:00
Oz Linden 3444d77609 merge changes for storm-1388 2011-06-17 17:34:27 -04:00
Logan Dethrow 796624d947 STORM-1320 OPEN-21 STORM-312 Update libndofdev on linux. Fixes spacenavigator. 2011-06-17 13:07:14 -04:00
Xiaohong Bao 0b92d52d78 fix for SH-1412: Mesh upload dialog freezes viewer when uploading certain meshes. 2011-06-13 11:52:50 -06:00
callum 7847c8941f 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-06-09 13:48:35 -07:00
Xiaohong Bao bdf34c2fbf Automated merge with https://bitbucket.org/davep/mesh-asset-deprecation 2011-06-07 18:24:04 -06:00
Xiaohong Bao dfdf6aed23 fix for SH-1765: palm tree model fails to load in viewer 2011-06-07 18:22:09 -06:00
Dave Parks f1784209d5 merge 2011-06-07 14:42:54 -05:00
Xiaohong Bao a3842d9637 fix for SH-588: Uploading a mesh crashes viewer 2011-06-06 23:04:48 -06:00
Richard Linden 960e8c05cb Automated merge with http://hg.secondlife.com/viewer-development 2011-06-02 13:35:15 -07:00
Leyla Farazha 926a9dcb58 merge 2011-06-01 15:44:46 -07:00
Leyla Farazha fe9eccdbae updating slvoice libraries 2011-06-01 15:40:29 -07:00
callum 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
Richard Linden 2595d53ded Automated merge with http://hg.secondlife.com/viewer-development 2011-05-25 18:14:55 -07:00
callum ae6ceb6193 Point to updated version of LLQtWebKit that supports local changes., 2011-05-25 10:19:00 -07:00
Loren Shih 781addcbc1 Automated merge up from viewer-development into mesh-development 2011-05-20 11:41:28 -04:00
Xiaohong Bao b1803a8cb9 fix for SH-1185: uploading large mesh file sometimes fails and locks up viewer. 2011-05-19 17:25:42 -06:00
callum 42654e759e Replace older (but working) reference to version of LLQtWebKit for Linux 2011-05-17 17:47:06 -07:00
Oz Linden 9075e1104f fix merge error in open source configurations to disable proprietary components 2011-05-17 19:26:18 -04:00
Nyx (Neal Orman) 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
callum 465072626e Typo in Mac/Darwin LLQtWebkit archive name 2011-05-17 10:05:49 -07:00
callum 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
Dave Parks 8a92612fd9 merge 2011-05-16 12:34:15 -05:00
callum 889f6cc3b3 Merge with tip 2011-05-13 17:09:40 -07:00
callum 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
Dave Parks 93696ac019 merge 2011-05-12 17:39:08 -05:00
brad kittenbrink f7a01d7b33 Merge. 2011-05-12 17:08:20 -07:00
Oz Linden 7be1755d61 merge changes for VWR-25727 2011-05-11 08:39:54 -04:00
brad kittenbrink 32bce75124 New build of ogg-vorbis package to fix VWR-25727. 2011-05-10 17:22:34 -07:00
brad kittenbrink 2661a4c2c9 Merge. 2011-05-09 11:26:24 -07:00
Nat Goodspeed 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
Dave Parks 8245e381cb STORM-1210 Make llconvexdecomposition private 2011-05-04 12:54:07 -05:00
Dave Parks 5eed546adf STORM-1210 Public URLs for pcre 2011-05-04 12:45:40 -05:00
Dave Parks 36c671cf15 STORM-1210 Update PCRE libs for mac and linux. 2011-05-04 12:12:42 -05:00
brad kittenbrink 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
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
Oz Linden 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
Brad Payne (Vir Linden) 67be82ad37 updated llconvexdecomposition for version linked with vs2010 havok 2011-04-28 11:00:27 -04:00
Merov Linden e6bd982c00 OPEN-50 : backing out that change that is incompatible with Incredibuild. 2011-04-27 10:47:41 -07:00