summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2011-02-01Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-01-28Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-01-28pull back fixes from betaOz Linden
2011-01-28Mergecallum
2011-01-28STORM-927 - FIX - [VWR-24426] SSL Handshake Failed Error when accessing ↵callum
web-based content on development viewers using recent Webkit 4.7 Also removed refs to debug vars used to specify location of pem file
2011-01-26for SH-846: design and implement the debug code to locate memory leakingXiaohong Bao
2011-01-24fix for SH-445: debug settings -> "CacheNumberOfRegionsForObjects" does not ↵Xiaohong Bao
limit the number of object cache files
2011-01-24Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-01-21MergeXiaohong Bao
2011-01-21Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: ↵Xiaohong Bao
Viewer attempting to load precached images in file types that are not being used.)
2011-01-21merge changes for storm-869Oz Linden
2011-01-21Automated merge up from viewer-developmentLoren Shih
2011-01-20merge changes from viewer-betaOz Linden
2011-01-20VWR-24426: fix SSL handshake error using webkit 4.7Kent Quirk
2011-01-19STORM-869 Minor irregulaties in settings.xml -- remove duplicate entries, ↵Jonathan Yap
formatting cleanup
2011-01-18debug tool to show texture info for SH-659: small textures not loaded.Xiaohong Bao
2011-01-18STORM-243 FIXED Disabled the "You just entered a region using a different ↵Vadim ProductEngine
server version..." pop-up notification.
2011-01-10Automated merge up from viewer-developmentLoren Shih
2011-01-07mergeDave Parks
2011-01-07Clean up some xml errors from settings.xmlDave Parks
2011-01-07merge changes for storm-34Oz Linden
2011-01-07Automated merge up from viewer-developmentLoren Shih
2011-01-05Merge with viewer-developmentcallum
2010-12-30Automated merge up from viewer-developmentLoren Shih
2010-12-29SOCIAL-401 FIX Change default web profiles URL to something closer to what ↵callum
will be released
2010-12-29SH-702 Broken Window: rename shader_heirarchy.txt to shader_hierarchy.txtLoren Shih
Trivial rename (file is an unused doc file).
2010-12-29Automated merge up from viewer-developmentLoren Shih
2010-12-28STORM-242 : pull into viewer-developmentMerov Linden
2010-12-28STORM-805 : pull into viewer-developmentMerov Linden
2010-12-27STORM-242 FIXED Fixed incorrect release notes URL in the "You just entered a ↵Vadim ProductEngine
region using a different server version" notification.
2010-12-23STORM-34 ADDITIONAL_FIX Made saving favorites in file per-account preference ↵Andrew Productengine
instead of per-machine. - Made changes in code of floater preferences and panel login that were required because of turning the setting per-account. - Added new method to LLFloaterPreference that looks for current user's record in saved favorites file and removes it.
2010-12-22STORM-810 : Auto update and related changes (integration request from team ↵Merov Linden
chopper)
2010-12-22Merge with tip of viewer-developmentcallum
2010-12-21SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7Monroe Linden
Reviewed by Callum
2010-12-21Merge from trunkAndrew A. de Laix
2010-12-20STORM-805 : Fix the map URLMerov Linden
2010-12-20Merge from viewer-development.Monroe Linden
2010-12-13Automated merge up from viewer-developmentLoren Shih
2010-12-10mergeDave Parks
2010-12-10Merge from viewer-developmentMonroe Linden
2010-12-10MergeMark Palange (Mani)
2010-12-10DoF tweaks cleanup.Dave Parks
2010-12-10DoF tweaks -- reviewed by Falcon.Dave Parks
2010-12-09change updater settings from check box to drop down menu; add choice of ↵Andrew A. de Laix
whether to install automatically as well as download automatically (not actually implemented yet).
2010-12-09STORM-728 FIXED Fixed crash when choosing to send snapshot by email in ↵Vadim ProductEngine
mouselook mode. - Fixed dereferencing a NULL pointer. - Added EMAIL SNAPSHOT floater to the list of floaters allowed in mouselook mode.
2010-12-08EXP-465 FIX Viewer window does not fill screen on Mac and Linux using ↵Richard Linden
--fullscreen disabled fullscreen mode for merge to viewer-development
2010-12-08merge with viewer-devRichard Linden
2010-12-07lamo programmer ui for setting downloader bandwidth limit.Andrew A. de Laix
2010-12-07merge viewer-development into web-profilesBrad Payne (Vir Linden)
2010-12-07Automated merge up from viewer-developmentLoren Shih