summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2011-08-08correct merge-induced error in settings.xmlOz Linden
2011-08-08merge back beta tagsOz Linden
2011-08-05merged .hgtagsDebi King (Dessie)
2011-08-04merge changes for storm-1538Oz Linden
2011-08-04merge changes for storm-1355Oz Linden
2011-08-04merge back disabling of watchdogOz Linden
2011-08-03Automated merge with file:///Users/oz/Work/V-PROz Linden
2011-08-02merge changes for storm-1535Oz Linden
2011-08-02disable watchdogOz Linden
2011-08-02Sync with lindenlab/viewer-developmentMerov Linden
2011-08-02pulling latest viewer-development into mesh merge branch.Nyx (Neal Orman)
2011-08-02merged .hgtagsDebi King (Dessie)
2011-08-01SH-2183 Add a debug setting to control whether or not to use multiple ↵Dave Parks
threads in LLCurl
2011-08-01merge changes for storm-1535Oz Linden
2011-07-29Include some certs that were missed in the latest cert update. Specifically,Roxie Linden
paypal had a verisign -2 CA cert, and the new trust list only includes -3. Also, disable use of the system cert store. Just use our list.
2011-07-29SH-2200 Fix for BSOD on 7800 Go on Vista when setting graphics detail to "High"Dave Parks
2011-07-29merge changes for storm-1510Oz Linden
2011-07-29late fix to set watchdog on at 60 secondsOz Linden
2011-07-29reconciled .hgtagsDebi King (Dessie)
2011-07-29Add geotrust CAs for some internal linden machines like teamcity, and moveRoxie Linden
the trust chain around a bit.
2011-07-28update CA's to most current set (taken from the osx lion cert store)Roxie Linden
2011-07-27SH-1990 Fix for redundantly applying some color scaling to sky and water ↵Dave Parks
(also add some snazzy specular bloom from the sun)
2011-07-26SH-2179 Fix for active UI elements glowing when basic shaders enabled.Dave Parks
2011-07-26mergeRichard Nelson
2011-07-26mergeRichard Nelson
2011-07-26mergeRichard Nelson
2011-07-26storm-1510: remove loginpage url from settings file (per code review ↵Oz Linden
suggestion from Richard)
2011-07-25merging latest viewer-development to mesh merge candidate.Nyx (Neal Orman)
2011-07-25SH-2031 Fix for bad vertex shader/fragment shader varying usage.Dave Parks
2011-07-24mergeDave Parks
2011-07-21mergeBrad Payne (Vir Linden)
2011-07-21merge up changes for 2.8.0 releaseOz Linden
2011-07-20Automated merge with http://hg.secondlife.com/viewer-developmentRichard Nelson
2011-07-19EXP-932 Implement system that fades from login page to (either) intro screen ↵Leyla Farazha
or loading screen instead of using a hard cut EXP-938 Turn off in-world audio until fade from intro/loading page complete EXP-939 Fade from intro/loading page to world, not to image of last login
2011-07-19STORM-1487 FIXED Changed the "get more gestures" marketplace URL.Vadim ProductEngine
2011-07-18merge changes for storm-1515Oz Linden
2011-07-18merge changes for storm-1510Oz Linden
2011-07-18re-enable the watchdogOz Linden
2011-07-17SH-2031 High risk changeset, but potentially high reward. Addresses frame ↵Dave Parks
stalls in renderer by never using the fixed function pipeline if shaders are available.
2011-07-16merge changes for storm-1482Oz Linden
2011-07-16merge late release changes and tagsOz Linden
2011-07-15After review and testing, realized that 'WatchdogEnabled' is actually true ↵jenn
to its name, and is a boolean, not a timeout value. 'MainloopTimeoutDefault' is the actual timeout value. Updated descriptions and values accordingly to set Watchdog timeout to 60 seconds.
2011-07-15storm-1510: update to new login display urlOz Linden
2011-07-14merge changes for 2.7.5 releaseOz Linden
2011-07-14EXP-998 Logging in with different user can remove newness for incorrect userLeyla Farazha
2011-07-13Watchdog timeout now set to 60 seconds for long-term use (instead of 20, ↵jenn
used during crash pile-on). Updated setting description field to describe how setting the value of WatchdogEnabled will affect Viewer behavior.
2011-07-12Merge for STORM-1482Aaron Stone
2011-07-12STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some ↵Aaron Stone
cleanups to the crash reporters, and the ability to use --set GroupName.SettingName to set parameters outside of the (default) Global settings group.
2011-07-11fix for SH-2051: viewer crashes when try to disbable "Show Upload Cost"Xiaohong Bao
2011-07-09mergeDave Parks