summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2015-01-19Automated merge with http://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2015-01-19MAINT-4790 WIP Show focused background image for login text fields.Mnikolenko ProductEngine
2015-01-15STORM-2082 Use correct icon for checkmarkJonathan Yap
Redo UI layout to indicate the two dependencies on the Imposters checkbox Reverse the ARC slider
2015-01-15STORM-2082 Remove Avatar detail from Basic tabJonathan Yap
2015-01-14STORM-2082 Assorted UI tweaks, better MaximumARC formula, pulldowns ↵Jonathan Yap
disappear faster
2015-01-14merge changes for fixes from nat and auraOz Linden
2015-01-14Integrate Callum's Mac slplugins packageNat Goodspeed
2015-01-14MAINT-4790 WIP code clean-upMnikolenko ProductEngine
2015-01-14MAINT-4790 WIP XML changesMnikolenko ProductEngine
2015-01-13changes to fix compiler warnings merged in from viewer-releaseOz Linden
2015-01-13Merge viewer-release and become 3.7.25maksymsproductengine
2015-01-13merge changes for 3.7.24-releaseOz Linden
2015-01-13MAINT-4790 WIP XML changesMnikolenko ProductEngine
2015-01-12On Mac, if we can't symlink .dylibs, print error message and continue.Nat Goodspeed
To this point, we've been failing the build with a Python OSError traceback, which is less than ideal.
2015-01-12increment viewer version to 3.7.25Oz Linden
2015-01-12Update viewer_package.py to grab slplugin.exe et al. from package.Nat Goodspeed
This only applies to the Windows package so far, because so far only the Windows package exists.
2015-01-12MAINT-2560 revertedMnikolenko ProductEngine
2015-01-09FIX MAINT-2701 restore 10 translated strings that were lost during an ↵eli
earlier dev merge (see Jira screenshots for details)
2015-01-08Rationalize use of AUTOBUILD environment variable across languages.Nat Goodspeed
Ensure that AUTOBUILD is always in native path syntax on every platform. Remove local build.sh logic to infer AUTOBUILD: either the generic build.sh has set it properly, or scream for help. Since cygwin bash scripts need a cygwin-syntax path to autobuild, convert to a local 'autobuild' variable using shell_path. Remove kludges in other languages involving cygdrive twiddling.
2015-01-07Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-updateNat Goodspeed
2015-01-07First cut at consuming new slplugins autobuild package.Nat Goodspeed
The contents are extracted, but not yet built into the viewer installer.
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-22update libs to match vivox distributionOz Linden
2014-12-19Sort include(...) lines to make it easier for a person to verify.Nat Goodspeed
2014-12-19Merge viewer-release and become 3.7.24simon
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-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 latest updates from nat and callumOz Linden
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 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-12Implicit conversion from ostream to string needs help in VS2013callum_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-12STORM-2082 Merge Hardware floater into main graphics preferences displayJonathan Yap
Change notifications so they are emitted only when an error occurs Put active preset at top of list Add Maximum ARC slider Merge two small methods into slider update code
2014-12-10Rename llround(..) to ll_round(..) because of a collision with MS llround ↵callum_linden
(long long round) in VS2013
2014-12-09STORM-2082 Improve file error handling, add help topic labels to new floaters.Jonathan Yap
2014-12-08Merge downstream code and become version 3.7.23simon
2014-12-08mergeBrad Payne (Vir Linden)
2014-12-05increment viewer version to 3.7.23Oz Linden
2014-12-04STORM-2082 Revert name of Reset button from Undo back to Reset. Hopefully ↵Jonathan Yap
this will be renamed Recommended Settings. Display a test icon (artwork needed) in the pulldown panel