summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-11-15MAINT-4537 WIP - more joint position management during outfit changesBrad Payne (Vir Linden)
2014-11-14remove skip from llframetimer_test now that it is fixedOz Linden
2014-11-14merge up to tip of viewer-tools-updateOz Linden
2014-11-14merge with headcallum_linden
2014-11-14Cinder pointed out my fix here for clang pickiness was different from hers ↵callum_linden
so I investigated and this is the causes of the slowdown - wrongly placed parens
2014-11-14Reworked changes to more closely match Cinders' - hers seem more correctcallum_linden
2014-11-14rewrite an llframetimer test to be less sensitive to extended ms_sleep callsOz Linden
2014-11-14Convert llhash() to use boost::hash, per Cinder's suggestion.Nat Goodspeed
2014-11-14MAINT-4537 WIP - joint position management during outfit changesBrad Payne (Vir Linden)
2014-11-14Remove a couple tests for unsigned long < 0.Nat Goodspeed
clang correctly notes that such tests add nothing to the runtime behavior of a program. Unfortunately, clang notes that in the form of a compile error.
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-14Skip LLFrameTimer test<3>, which fails with Xcode 6.x builds.Nat Goodspeed
Hopefully this is temporary until we figure out the real problem!
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. Refresh from viewer-release after 3.7.20 released.Monty Brandenberg
2014-11-10merge changes for 3.7.20-releaseOz Linden
2014-11-10increment viewer version to 3.7.21Oz Linden
2014-11-06BUG-7698, BUG-7688, BUG-7694 (others) CDN connection issues.Monty Brandenberg
Under pipelining, requests were given a 5x timeout factor due to the way that the timeout clock works in libcurl. Under CDN load, connections were not being torn down quickly and it was only this timer that led to disconnect and retry. So, we want to break a connection that isn't making progress but that isn't immediately possible. We'll compromise with a 60S timeout that (we hope) will be neither too long for stalled connections nor too short for large asset transfer requests.
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
2014-10-28adding line to test that app was signed appropriatelyJJ Linden
2014-10-28add --deep to codesign for the macOz Linden
2014-10-28merge changes for 3.7.19-releaseOz Linden
2014-10-28merge changes for 3.7.19-releaseOz Linden
2014-10-28increment viewer version to 3.7.20Oz Linden
2014-10-24Suppress non-useful NaN test in llsd_new_tut.cppNat Goodspeed
2014-10-23Bring in new TUT library build. Clean up ensure_equals() overloads.Nat Goodspeed
The new TUT library build eliminates the ambiguity about ensure_equals(const char*, ...) versus ensure_equals(const std::string&, ...). Now it's all based on const std::string&. Remove pointless const char* overloads and ambiguous forwarding templates. With clang in Xcode 6, any new datatypes we intend to use with ensure_equals() must have operator<<(std::ostream&, datatype) declared BEFORE lltut.h #includes tut.hpp. Reorder code in certain test source files to guarantee that visibility.
2014-10-23merge changes for STORM-2081Oz Linden
2014-10-23STORM-2081 - Guard against null gWindowImplementation when fullscreen ↵Cinder
(crashes OS X Yosemite)
2014-10-23Fix Xcode 6 compile errors relating to tut::ensure_equals() overloads.Nat Goodspeed
lltut.h declares a number of ensure_equals() overloads for various data types, notably the types supported by LLSD. We expect these to be called by tut code. But the tut code in question is in a template in tut.hpp -- which was #included BEFORE the overloads were declared. Previous C++ compilers have evidently made multiple passes, collecting the relevant overloads before attempting to compile the template bodies. clang does not, complaining that the overloads must be declared before the tut.hpp template code that references them. Reordering parts of lltut.h seems to address that problem. For similar reasons, test programs that use StringVec.h and its operator<<() must #include StringVec.h before lltut.h. Add ensure_equals(const std::string&, const LLSD::Binary&, const LLSD::Binary&) overload. The sloppy mix of (const char*, ...) and (const std::string&, ...) overloads bothers me, since for many of those ... types we seem to have to duplicate them.
2014-10-22Update to build on Xcode 6.0 (fix unit tests): minor fix for debug only unit ↵callum_linden
test
2014-10-22merge with headOz Linden
2014-10-22Remove unit test case that relied on undefined order of evaluationOz Linden
in: 'cout << a() << b()' the order of evaluation of a() and b() is undefined.
2014-10-22Update to build on Xcode 6.0 (fix unit tests): comment out failing unit test ↵callum_linden
in llsd_new_tut.cpp to let the build proceed - will fix later
2014-10-22merge with more fixes from callumOz Linden
2014-10-22correct merge error in llerror_test.cppOz Linden
2014-10-22Update to build on Xcode 6.0 (fix unit tests): remove unused statement warningcallum_linden
2014-10-22Update to build on Xcode 6.0 (fix unit tests): skip llerror_test test for ↵callum_linden
now - operator << issues on clang