summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
AgeCommit message (Collapse)Author
2011-09-13merge changes for 3.0.3 beta 2 fixesOz Linden
2011-09-12sh-2379: re-enable multi-threaded curl (fixes viewer stall, may re-introduce ↵Oz Linden
some crashes)
2011-09-08Merge from viewer-experienceLeslie Linden
2011-09-07Merge from viewer-experienceLeslie Linden
2011-09-02Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-09-02merge changes for storm-1027Oz Linden
2011-08-31Automated merge with http://hg.secondlife.com/viewer-developmentRichard Nelson
2011-08-31turn on private memory pool by default.Xiaohong Bao
2011-08-31MergeXiaohong Bao
2011-08-31storm-1578: change default Away timeout to "never"Oz Linden
2011-09-08SRCH-1623: UNDO EXP--1081Oz Linden
2011-08-26EXP-1111 FIX LLQtWebKit (and related media system) should log events, ↵callum
progress etc. to make debugging problems easier
2011-08-25merge changes for storm-1542Oz Linden
2011-08-23mergeLogan Dethrow
2011-08-22STORM-1542 FIXED Changed search URL back from search-beta to search.sl.com.Vadim ProductEngine
2011-08-20merge changes for storm-1562Oz Linden
2011-08-20merge changes for storm-782Oz Linden
2011-08-19EXP-840 FIX -- Create outbox panels to help the user get started on the ↵Leslie Linden
marketplace and to indicate drag and drop targets. EXP-858 PROGRESS -- Outbox sync failure error handling EXP-908 FIX -- Hide outbox when appropriate EXP-1062 FIX -- Add modal dialog for outbox sync complete EXP-1096 FIX -- Extra space below Received Items panel for an account that does not have a Merchant Account setup, no outbox display EXP-1104 FIX -- User can activate Merchant Outbox synch button when outbox is empty * Added separate class for outbox view to support error tag rendering * Added confirmation for sync complete. * Added different outbox messages for empty outbox, non-merchant and error: merchant but no outbox * Progress on a bunch of other fronts.
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
fixed search url
2011-08-15EXP-1081 FIX add search auth token as cookie instead of query paramRichard Nelson
moved all parameters other than search query to base64 encoded llsd
2011-08-15STORM-782 FIXED Removing the useless 'Compress snapshots to disk' item from ↵Vadim ProductEngine
the Advanced menu. Removing the corresponding setting as well because it's not used anywhere.
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 ↵Dave Parks
threads in LLCurl
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 ↵Oz Linden
suggestion from Richard)
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-20add a debug setting "MemoryPrivatePoolEnabled" to turn on/off private memory ↵Xiaohong Bao
pool.
2011-07-20fix a typo and trun off "MemoryFailurePreventionEnabled"Xiaohong Bao