summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-12-12Remove unneeded media plugin header filecallum_linden
2014-12-12Implicit conversion from ostream to string needs help in VS2013callum_linden
2014-12-12merge latest fix from natOz Linden
2014-12-12Make JsonCpp.cmake reference Windows lib names we actually use.Nat Goodspeed
2014-12-12merge dictionary changeOz Linden
2014-12-12fix dos line endingsOz 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-12Make LINE_NUMBER_HERE workaround conditional on LL_WINDOWS.Nat Goodspeed
The referencing code is all within LL_WINDOWS conditionals, so the dummy variable must be enclosed that way too -- otherwise we get unreferenced-variable warnings-as-errors on other platforms.
2014-12-12Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2014-12-12Wrap call to autobuild in some diagnostic code.Nat Goodspeed
Hopefully this will make certain errors clearer, notably failure to launch autobuild due to "cannot find the file specified".
2014-12-12Fix up remaining llround() -> ll_round() issuescallum_linden
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-12Update viewer to consume googlemock build 297460.Nat Goodspeed
2014-12-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2014-12-11Update viewer to consume colladadom build 297450Nat 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-11Update viewer to consume boost build 297445 (no fchmodat())Nat Goodspeed
2014-12-11SL-92 WIPBrad Payne (Vir Linden)
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-10merge with headcallum_linden
2014-12-10Match up our usage of MS APIs with function prototypes in the new version of ↵callum_linden
the API
2014-12-10Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2014-12-10Update autobuild.xml with current builds from Tools Update spreadsheet.Nat Goodspeed
This is mostly Mac and Linux, given rev 6cf8a8cd07c6, save for glui, jsoncpp and llphysicsextensions_source, which also update Windows.
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-09merge with headcallum_linden
2014-12-09no implicit conversion from ofsteam to bool in VS2013!!!!callum_linden
2014-12-09update dictionaries to a single common platform buildOz Linden
2014-12-09Made merge to correct version of file.Aura Linden
2014-12-08Merged.Aura Linden
2014-12-08Pointed to newest havok repos.Aura Linden
2014-12-08Update autobuild to point to new (Windows) third poarty libraries we just ↵callum_linden
built and configure for VS2013
2014-12-08Merge downstream code and become version 3.7.23simon
2014-12-08SL-92 WIP - hover height communicated via appearance messages.Brad Payne (Vir Linden)
2014-12-08mergeBrad Payne (Vir Linden)
2014-12-06Update viewer to consume mesa build 297283.Nat Goodspeed
2014-12-05merge changes for 3.7.22-releaseOz Linden
2014-12-05increment viewer version to 3.7.23Oz Linden
2014-12-05Added tag 3.7.22-release for changeset bc61801f6140Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 20:18:57 +0000