summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-12-12Merge with headcallum_linden
2014-12-12Update VSTool that is used to set configuration in MSVC solution file for ↵callum_linden
MSVC 2013 (v12.x)
2014-12-12Another round of ll_round()Nat Goodspeed
2014-12-12Automated merge with http://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2014-12-11Re-add missing variable declaration (not that it's very useful and no idea ↵callum_linden
how it was removed)
2014-12-11Add bespoke ctor/dtor that align on 16byte boundaries when creating things ↵callum_linden
on the heap
2014-12-11Fix a couple more ll_round() callsNat Goodspeed
2014-12-11Disambiguate a few ensure() calls.Nat Goodspeed
These were of the form ensure(std::string, something convertible to bool). Not sure what the ambiguity was, but ensure(std::string, bool(something)) works better.
2014-12-11Add /SAFESEH:NO /NODEFAULTLIB:LIBCMT to viewer linker switches.Nat Goodspeed
zlib cannot be linked with SAFESEH, which is the VS 2013 default, so every consumer must set /SAFESEH:NO. /NODEFAULTLIB:LIBCMT seems to eliminate many duplicate-symbol link errors.
2014-12-10Match up our usage of MS APIs with function prototypes in the new version of ↵callum_linden
the API
2014-12-10Merge with headcallum_linden
2014-12-10Fix for incorrectly formatted #if statements (worked on clang FWIW!)callum_linden
2014-12-10Automated merge with http://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2014-12-10Replace boost::lambda::_1 with boost::phoenix::placeholders::arg1.Nat Goodspeed
Apparently in Boost 1.57 with Xcode 6, the combination of Boost.Lambda and Boost.Function is broken -- Trac ticket 10864: https://svn.boost.org/trac/boost/ticket/10864 However, Boost.Phoenix provides an acceptable replacement.
2014-12-10Clarify for VS 2013 that an operator bool() method returns bool.Nat Goodspeed
For some reason VS 2013 (unlike its predecessors and other current compilers) needs us to explicitly convert an operator bool() method's return expression to bool. :-P
2014-12-10Fix for build problems with LLTrace::AccumulatorBuffer copy ctor in VS2013 ↵callum_linden
(only)
2014-12-10Rename llround(..) to ll_round(..) because of a collision with MS llround ↵callum_linden
(long long round) in VS2013
2014-12-09no implicit conversion from ofsteam to bool in VS2013!!!!callum_linden
2014-12-05Wrap #pragma clang in #if __clang__, else VS produces fatal warnings.Nat Goodspeed
2014-12-04Make havok_source package name agree with name from repo URL.Nat Goodspeed
Until we get a havok-source package built with new metadata-bearing autobuild, the package name in autobuild.xml and CMake must agree with the tarball filename.
2014-11-21automate keeping the About SL -> Licenses tab correctOz Linden
2014-11-19OPEN-282 - Define LL_THREAD_LOCAL for our platforms in order to unify TLS ↵Cinder
support
2014-11-19OPEN-282 Use pthreads for TLS on macCinder
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-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-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-10Fix typo in new viewer_manifest.py codesigning logic.Nat Goodspeed
'raisef' is not a Python statement.
2014-11-10increment viewer version to 3.7.21Oz 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-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-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