summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
AgeCommit message (Expand)Author
2011-08-23mergeLogan Dethrow
2011-08-20merge changes for storm-1562Oz Linden
2011-08-20merge changes for storm-782Oz Linden
2011-08-18Merge.Logan Dethrow
2011-08-18LLProxy: Renamed a setting to better describe what it controls.Logan Dethrow
2011-08-17storm-1562: disable multi-threaded curl to prevent crashOz Linden
2011-08-15EXP-1081 FIX add search auth token as cookie instead of query paramRichard Nelson
2011-08-15EXP-1081 FIX add search auth token as cookie instead of query paramRichard Nelson
2011-08-15STORM-782 FIXED Removing the useless 'Compress snapshots to disk' item from t...Vadim ProductEngine
2011-08-08mergeLogan Dethrow
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 back disabling of watchdogOz Linden
2011-08-03Automated merge with file:///Users/oz/Work/V-PROz 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 threads...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-28MergeLogan Dethrow
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 suggesti...Oz Linden
2011-07-25merging latest viewer-development to mesh merge candidate.Nyx (Neal Orman)
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
2011-07-19mergeLogan Dethrow
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-15After review and testing, realized that 'WatchdogEnabled' is actually true to...jenn
2011-07-15storm-1510: update to new login display urlOz Linden
2011-07-16merge late release changes and tagsOz 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-13Code cleanup for the SOCKS 5 proxy viewer.Logan Dethrow
2011-07-13Watchdog timeout now set to 60 seconds for long-term use (instead of 20, used...jenn
2011-07-12mergeLogan Dethrow
2011-07-12Removed default proxy server.Logan Dethrow
2011-07-11fix for SH-2051: viewer crashes when try to disbable "Show Upload Cost"Xiaohong Bao
2011-07-09mergeDave Parks
2011-07-09SH-2007 Code cleanup, expand minimum header size to 4KB, better comments arou...Dave Parks