summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2014-12-22update libs to match vivox distributionOz Linden
2014-12-19Sort include(...) lines to make it easier for a person to verify.Nat Goodspeed
2014-12-18Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2014-12-18increment viewer version to 3.7.24Oz Linden
2014-12-17Delete misleading comment about testing llcapabilitylistener.Nat Goodspeed
There was a comment in CMakeLists.txt left over from 2009 (!) about commenting out the unit test for llcapabilitylistener. Fortunately we've since reinstated the test as an integration test, but the comment was never removed -- until now.
2014-12-17merge latest updates from nat and callumOz Linden
2014-12-15fix for some std::pair/STL syntaxcallum_linden
2014-12-15merge changes for 3.7.22-releaseOz Linden
2014-12-12Implicit conversion from ostream to string needs help in VS2013callum_linden
2014-12-12Eliminate use of boost::lambda with boost::function (Trac #10864).Nat Goodspeed
https://svn.boost.org/trac/boost/ticket/10864 I've used boost::lambda with boost::function in a number of creative ways over the years. But the clang 6 shipped with Xcode 6 seems to have somehow broken lambda + function in Boost 1.57. boost::phoenix is a partial workaround. Sadly, lambda's comma-operator overload doesn't seem to be supported, necessitating a couple ugly workarounds. With real lambdas now supported by current compilers, I'm sure the Boost community has little incentive to repair the lambda + function problem. Presumably we'll be able to use such features ourselves Real Soon Now...
2014-12-10Rename llround(..) to ll_round(..) because of a collision with MS llround ↵callum_linden
(long long round) in VS2013
2014-12-08mergeBrad Payne (Vir Linden)
2014-12-05increment viewer version to 3.7.23Oz Linden
2014-12-01merge fixBrad Payne (Vir Linden)
2014-12-01remove unused gpu table code, improve logging for gpu benchmarksOz Linden
2014-12-01mergeBrad Payne (Vir Linden)
2014-12-01mergeBrad Payne (Vir Linden)
2014-12-01merge changes for 3.7.21 releaseOz Linden
2014-12-01increment viewer version to 3.7.22Oz Linden
2014-11-24Attempt to thread needle for guesstimation phase of GPU classificationGraham Linden
2014-11-21automate keeping the About SL -> Licenses tab correctOz Linden
2014-11-21Tweak conversion from tested bandwidth to get better reads on low-end systemsGraham Linden
2014-11-20Put back old thresholds to try to get better match on old/new identification ↵Graham Linden
per-card
2014-11-19Roll back changes to geo drawn in gpu_bench to stop punishing cards with low ↵Graham Linden
fill rate
2014-11-18Adjust gpu_bench thresholds and move VB set outside loop again for speedGraham Linden
2014-11-18Fix for gpu_bench crash without parallels knock-onGraham Linden
2014-11-17Attempt wider disable of using profile API when timer query is not presentGraham Linden
2014-11-17Avoid using GL_ARB_timer_query functionality when not supported and protect ↵Graham Linden
against probably-not-NULL current bound shader pointer
2014-11-15MAINT-4537 WIP - comments and cleanupBrad Payne (Vir Linden)
2014-11-15MAINT-4537 WIP - more joint position management during outfit changesBrad Payne (Vir Linden)
2014-11-14MAINT-4537 WIP - joint position management during outfit changesBrad Payne (Vir Linden)
2014-11-14Comment out now-unused GPU_TABLE_FILENAME in llfeaturemanager.cpp.Nat Goodspeed
The "death to the GPU table" change has commented out the only references to the GPU_TABLE_FILENAME constant, and Xcode 6.x regards that as an error.
2014-11-14MAINT-4537 WIP - order of operations during outfit changeBrad Payne (Vir Linden)
2014-11-14Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2014-11-12Eliminate LLAppViewer::cleanup() dup --analyzeperformance code block.Nat Goodspeed
Not sure at what point the redundancy was introduced, but it seems clear we only want to run performance analysis once per shutdown.
2014-11-11Merge changes for 3.7.20-releasemaksymsproductengine
2014-11-10Fix typo in new viewer_manifest.py codesigning logic.Nat Goodspeed
'raisef' is not a Python statement.
2014-11-10mergeBrad Payne (Vir Linden)
2014-11-10merge changes for 3.7.20-releaseOz Linden
2014-11-10increment viewer version to 3.7.21Oz Linden
2014-11-03mergeBrad Payne (Vir Linden)
2014-11-03Pull in viewer-release and become version 3.7.20simon
2014-11-03SL-93 WIP - pelvis fixup offsetsBrad Payne (Vir Linden)
2014-10-31settings.xml updateBrad Payne (Vir Linden)
2014-10-30SL-93 WIP - missing includeBrad Payne (Vir Linden)
2014-10-30SL-93 - WIP on managing pelvis fixups using new joint offset frameworkBrad Payne (Vir Linden)
2014-10-29fix signature target pathOz Linden
2014-10-29reorder finalizing for OSX so that the signature is applied to the app after ↵Oz Linden
copying into the dmg; preserves extended attributes
2014-10-29merge changes for MAINT-4560Oz Linden
2014-10-28fix for formatting issueJJ Linden