summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2014-12-16Isolate #pragma clang to __clang__ compilations.Nat Goodspeed
2014-12-15fix for some std::pair/STL syntaxcallum_linden
2014-12-15MAINT-4716: correct reading of and debug display for avatar render cost infoOz 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-14STORM-2082 Remove ugly list of control names. Instead, obtain the list from ...Jonathan Yap
2014-12-13STORM-2082 When a control is greyed out make sure it's associated text is gre...Jonathan Yap
2014-12-13STORM-2082 Write out settings to preset file if settings changed on the login...Jonathan Yap
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-12STORM-2082 Merge Hardware floater into main graphics preferences displayJonathan Yap
2014-12-11Re-add missing variable declaration (not that it's very useful and no idea ho...callum_linden
2014-12-11Add bespoke ctor/dtor that align on 16byte boundaries when creating things on...callum_linden
2014-12-11Fix a couple more ll_round() callsNat Goodspeed
2014-12-11Disambiguate a few ensure() calls.Nat Goodspeed
2014-12-11Add /SAFESEH:NO /NODEFAULTLIB:LIBCMT to viewer linker switches.Nat Goodspeed
2014-12-10Match up our usage of MS APIs with function prototypes in the new version of ...callum_linden
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
2014-12-10Clarify for VS 2013 that an operator bool() method returns bool.Nat Goodspeed
2014-12-10Fix for build problems with LLTrace::AccumulatorBuffer copy ctor in VS2013 (o...callum_linden
2014-12-10Rename llround(..) to ll_round(..) because of a collision with MS llround (lo...callum_linden
2014-12-09no implicit conversion from ofsteam to bool in VS2013!!!!callum_linden
2014-12-09STORM-2082 Improve file error handling, add help topic labels to new floaters.Jonathan Yap
2014-12-08mergeBrad Payne (Vir Linden)
2014-12-05merge changes for 3.7.22-releaseOz Linden
2014-12-05increment viewer version to 3.7.23Oz 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
2014-12-04STORM-2082 Revert name of Reset button from Undo back to Reset. Hopefully th...Jonathan Yap
2014-12-03further improvements to avatar render info display and logging of associated ...Oz Linden
2014-12-03remove obsolete menu entries in favor of integrated render info displayOz Linden
2014-12-03STORM-2082 Send signal to pulldown panel to refresh itselfJonathan Yap