summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2014-12-23Updated path to NSIS installer for most recent (non-beta) version of NSIS v2.46callum_linden
2014-12-23merge some linux fixes and OPEN-287Oz Linden
2014-12-23fix dos line endingsOz Linden
2014-12-22Investigative check-in to see if system clock() function can be used to time ...callum_linden
2014-12-22update libs to match vivox distributionOz Linden
2014-12-22work arounds to compile on linuxOz Linden
2014-12-22merge latest trunk changesOz Linden
2014-12-19Merge backout of forcing DEBUG_PREBUILT setting.Nat Goodspeed
2014-12-19Backed out changeset 4356b6a222c7: forcing DEBUG_PREBUILT output.Nat Goodspeed
2014-12-19Defend against cygwin-style AUTOBUILD path in environment.Nat Goodspeed
2014-12-19Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2014-12-19Sort include(...) lines to make it easier for a person to verify.Nat Goodspeed
2014-12-19Force DEBUG_PREBUILT on in Prebuilt.cmake to debug failures on TC.Nat Goodspeed
2014-12-18Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2014-12-18merge latest changes for windowsOz Linden
2014-12-18allow signed vs unsigned compare in gccOz Linden
2014-12-17Update autobuild to point to new version of jsoncpp and change lib names to m...callum_linden
2014-12-17Update autobuild to point to new (VS2013) Havok files and fix up name mismatchcallum_linden
2014-12-17include Prebuilt.cmake before using macroOz Linden
2014-12-17Move the cmake package tracking files under the packages directoryOz Linden
2014-12-17Delete misleading comment about testing llcapabilitylistener.Nat Goodspeed
2014-12-17merge up to latest changes from callum and natOz Linden
2014-12-17adjust cmake not to attempt loads of packages on the wrong platformsOz Linden
2014-12-17merge latest updates from nat and callumOz Linden
2014-12-17Produce error message, not traceback, when test program doesn't build.Nat Goodspeed
2014-12-16For one use case, boost::bind() better than boost::phoenix::bind().Nat Goodspeed
2014-12-16Remove Visual Studio workaround for lack of std::fpclassify().Nat Goodspeed
2014-12-16Fix another empty #elif to plain #else.Nat Goodspeed
2014-12-16Isolate #pragma clang to __clang__ compilations.Nat Goodspeed
2014-12-15fix for some std::pair/STL syntaxcallum_linden
2014-12-15Merge with headcallum_linden
2014-12-15Add feature (enabled) to turn off media pluginscallum_linden
2014-12-15include quicktime package only on windowsOz Linden
2014-12-15include libuuid and fontconfig only on linuxOz Linden
2014-12-15don't include glext on Mac where it is not usedOz Linden
2014-12-15remove redundant include of Audio.cmakeOz Linden
2014-12-15merge changes for 3.7.22-releaseOz Linden
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-12fix dos line endingsOz Linden
2014-12-12Eliminate use of boost::lambda with boost::function (Trac #10864).Nat Goodspeed
2014-12-12Make LINE_NUMBER_HERE workaround conditional on LL_WINDOWS.Nat Goodspeed
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 MSV...callum_linden
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 ho...callum_linden