summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-12-07MAINT-2040 Remove leftover debug spam.Dave Parks
2012-12-05Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-12-05MAINT-1760 Fix for opaque water glowing when wearing certain rigged attachments.Dave Parks
2012-12-05Automated merge with https://bitbucket.org/lindenlab/viewer-catXiaohong Bao
2012-12-05fix fo SH-3151: Some textures not in view load when avatar sits down.Xiaohong Bao
2012-12-05Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-12-05MAINT-2040 Fix for rigged meshes sometimes not updating properly with color ↵Dave Parks
changes.
2012-12-04Fix merge breakagesimon@Simon-PC.lindenlab.com
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-04Pull back upstream fixes from viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-03more for MAINT-1955: Viewer crashes while login after clearing cacheXiaohong Bao
2012-12-03MAINT-1748 Users have an ability to sell non existing objects from content ↵Kelly Washington
of other object * Keep the buy-contents floater subscribed to inventory changes on the object. reviewed with Simon
2012-11-30Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-11-30MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people ↵Dave Parks
to update their drivers. Reviewed by Simon
2012-11-27merge changes for DRTVWR-230Oz Linden
2012-11-26Automated merge with https://bitbucket.org/lindenlab/viewer-catXiaohong Bao
2012-11-26fix for MAINT-1955: Viewer crashes while login after clearing cacheXiaohong Bao
2012-11-26MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering ↵Dave Parks
enabled. Reviewed by VoidPointer
2012-11-26MAINT-1953 Add NVIDIA GT 230 to gpu tableDave Parks
2012-11-26MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in ↵Dave Parks
setGraphicsLevel Reviewed by Simon
2012-11-26merge changes for DRTVWR-249Oz Linden
2012-11-21MAINT-1950 Fix for offscreen objects not getting rebuilt sometimes.Dave Parks
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-20MAINT-1270 Fix for flexi prims showing up as discs when first loading.Dave Parks
Reviewed by Stinson.
2012-11-20MAINT-1270 Fix for flexi prims showing up as discs when first loading.Dave Parks
Reviewed by Stinson.
2012-11-20merge changes for DRTVWR-247Oz Linden
2012-11-20Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-20merge changes for DRTVWR-229Oz Linden
2012-11-19MAINT-1841 Fix for mac/linux buildDave Parks
2012-11-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-19Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-11-19MAINT-1841 Use NVAPI to force NVIDIA GPU power management mode to prefer max ↵Dave Parks
performance Reviewed by Simon.
2012-11-19Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-19increment version to 3.4.4Oz Linden
2012-11-19Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-19merge changes for DRTVWR-245Oz Linden
2012-11-16MAINT-1890 FIX Removing previous hacky fix for this issue. The better ↵William Todd Stinson
solution is to clamp the update_period to a reasonable number of frames (32).
2012-11-16MAINT-1942 Increase maximum animation length from 30 seconds to 60 secondsKelly Washington
reviewed with Simon
2012-11-16Some Mac header #defines macros like check and equivalent -- gack!!Nat Goodspeed
Given that third-party libraries (such as Boost) can and do use those names, properly namespace-scoped, it's unpardonable to break any such innocent usage with a macro. Given the pervasiveness of the need, introduce a header file with the requisite #undef directives.
2012-11-16Certain test and example programs now need the Boost.System library.Nat Goodspeed
2012-11-16Boost 1.52 no longer supports Boost.Filesystem v2 -- don't request.Nat Goodspeed
Instead of compatibility mode, #defining BOOST_FILESYSTEM_VERSION to 2 only gets you a compile error these days.
2012-11-16Remove sensitivity to Boost library versions in viewer_manifest.py.Nat Goodspeed
2012-11-16Fix Boost shared-library version suffixes in Copy3rdPartyLibs.cmake.Nat Goodspeed
2012-11-16Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-15Remove Boost version "1_45" baked into library names.Nat Goodspeed
On Windows, LLPrimitive.cmake named four Boost libraries with names ending in the string 1_45. Now that we're trying to upgrade Boost to 1.52, those suffixes are inappropriate. Fortunately the libraries in our current Boost package do not have version-stamped names, so we hope this fix can survive for several Boost upgrades to come.
2012-11-15SH-3275 WIP Run viewer metrics for object update messagesRichard Linden
accidentally left some debug output on, turned it back off for merge to trunk
2012-11-14DRTVWR-241: resolve merge conflict with viewer-development.Nat Goodspeed
LLUI::setupPaths() went away with DRTVWR-210.
2012-11-14Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed