summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2015-01-07STORM-2082 Display active preset as first choice in dropdown boxJonathan Yap
2015-01-07STORM-2082 MergeJonathan Yap
2015-01-07STORM-2082 Add back labels for quality and speed sliderJonathan Yap
Change two sliders back to comboboxes. Rename label "Other" to "General" Move Max ARC to top of that list Move Shaders block to above Mesh block
2015-01-07Replace reduce(operator.or_, ...) with any(...).Nat Goodspeed
The any() builtin was introduced in Python 2.5. Not only is its intent clearer, but it handles the case of zero items -- which the reduce(or_) construct does not. Sporadically we've seen exceptions from generate_breakpad_symbols.py when reduce(or_, ...) is given zero items. This masks the actual error (failure to dump symbols? failure to read them?), masquerading as a bug in the Python script.
2014-12-29Fix typo introduced into viewer_manifest file (sprefix -> prefix)callum_linden
2014-12-23Restore Unicode path to viewer_manifest script - apparently we use the ↵callum_linden
Unicode version of NSIS, not the one from the NULLSOFT site
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
ms_sleep() calls and adjust expectations accordingly
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
It appears that our trouble was due to a cygwin-style path in the AUTOBUILD environment variable, and that changeset 0e0bd8b546ad fixed it.
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-19merge changes for 3.7.23Oz Linden
2014-12-18Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2014-12-18increment viewer version to 3.7.24Oz Linden
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 ↵callum_linden
match those in package
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
There was a comment in CMakeLists.txt left over from 2009 (!) about commenting out the unit test for llcapabilitylistener. Fortunately we've since reinstated the test as an integration test, but the comment was never removed -- until now.
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
A traceback from a Python script always makes people think there's a bug in your script. Even when a test program fails to build, CMake often (always?) tries to run it anyway, via our run_build_test.py script. For that case, produce a straightforward error message -- rather than an OSError traceback that doesn't even mention the program name!
2014-12-16For one use case, boost::bind() better than boost::phoenix::bind().Nat Goodspeed
We use boost::phoenix::placeholders::arg1 to imply a whole lambda expression, replacing boost::lambda. But to bind a plain function in a more straightforward way, seems classic boost::bind() works while boost::phoenix::bind() does not.
2014-12-16Remove Visual Studio workaround for lack of std::fpclassify().Nat Goodspeed
Visual Studio 2013 evidently does provide std::fpclassify(), so we no longer need the funky local alias.
2014-12-16Fix another empty #elif to plain #else.Nat Goodspeed
2014-12-16Isolate #pragma clang to __clang__ compilations.Nat Goodspeed
It's very irritating that Visual Studio produces a warning for unrecognized #pragmas, which we then merrily turn into an error -- #pragma is inherently compiler-specific!
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
the View data Remove a few remants used by the old hardware floater
2014-12-13STORM-2082 When a control is greyed out make sure it's associated text is ↵Jonathan Yap
greyed out. Sky: has two dependencies; grey it out when either one is not available. Remove Basic Shaders from Basic tab
2014-12-13STORM-2082 Write out settings to preset file if settings changed on the ↵Jonathan Yap
login page Code improvements from bitbucket comments
2014-12-12Remove unneeded media plugin header filecallum_linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 02:25:30 +0000