summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-08Merge downstream code and become version 3.7.23simon
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
Until we get a havok-source package built with new metadata-bearing autobuild, the package name in autobuild.xml and CMake must agree with the tarball filename.
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
2014-12-03further improvements to avatar render info display and logging of associated ↵Oz Linden
server messages
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
2014-12-03STORM-2082 Remove Apply button.Jonathan Yap
Add new control variable to track which preset is active. Save settings to active preset when clicking on Ok button. Initial work to make pulldown operational. Still to do: add pretty icon for current preset. Notifications do not appear when called from this panel.
2014-12-02Merge downstream code and become 3.7.22simon
2014-12-02STORM-2082 Add Recommended buttonJonathan Yap
2014-12-01STORM-2082 Improve text in notifications.Jonathan Yap
Disable delete button when thre is nothing to be deleted.
2014-12-01merge fixBrad Payne (Vir Linden)
2014-12-01remove unused gpu table code, improve logging for gpu benchmarksOz Linden
2014-12-01mergeBrad Payne (Vir Linden)
2014-12-01mergeBrad Payne (Vir Linden)
2014-12-01merge changes for 3.7.21 releaseOz Linden
2014-12-01STORM-2082 Better control on how (or if) to display Default presetJonathan Yap
Make sure default preset is created when flyout panel is activated Only display deleted notification upon successful deletion
2014-12-01merge changes for 3.7.21 releaseOz Linden
2014-12-01increment viewer version to 3.7.22Oz Linden
2014-12-01STORM-2082 mergeJonathan Yap
2014-12-01STORM-2082 Disable preset controls unless logged inJonathan Yap
2014-12-01Improve display of avatar rendering info, remove last use of ↵Oz Linden
RenderAutoMuteFunctions
2014-12-01STORM-2082 Fix linux compile errorJonathan Yap
2014-12-01STORM-2082 Implement save floater and some code cleanup.Jonathan Yap
2014-11-30STORM-2082 Make code more generic to handle the future camera presets.Jonathan Yap
2014-11-30STORM-2082 Implement delete floaterJonathan Yap
2014-11-28STORM-2082 Initial support for presets popup from status barJonathan Yap
2014-11-27STORM-2082 Get writing out and loading presets workingJonathan Yap
2014-11-26STORM-2082 Code now fills comboboxJonathan Yap
2014-11-26STORM-2082 Start to convert code to support xml file processingJonathan Yap
2014-11-25STORM-2082 Changed initial text in dropdown boxJonathan Yap
2014-11-25STORM-2082 Add tab containers, remove buttons and obsolete debug settingJonathan Yap
2014-11-25STORM-2082 Small fix for button highlighting issueJonathan Yap
2014-11-24Attempt to thread needle for guesstimation phase of GPU classificationGraham Linden
2014-11-24Merge downstream code and become version 3.7.21simon
2014-11-23STORM-2082 Allow saving and loading of graphic settingsJonathan Yap
2014-11-21automate keeping the About SL -> Licenses tab correctOz Linden
2014-11-21Tweak conversion from tested bandwidth to get better reads on low-end systemsGraham Linden