summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
AgeCommit message (Expand)Author
2014-02-10Merge pull from lindenlab/viewer-releaseMerov Linden
2014-01-07merge changes for storm-1980Oz Linden
2013-12-18STORM-1980: set new region restart sound uuidOz Linden
2013-12-12Pull merge from lindenlab/viewer-releaseMerov Linden
2013-12-05Renamed floater_social to floater_facebook for ACME-1205Cho
2013-11-19STORM-1980 Merge changes Oz made (new way of detecting an agent has changed r...Jonathan Yap
2013-11-11merge changes for 3.6.10-releaseOz Linden
2013-11-07DRTVWR-338 Make an inocuous change to get a new build number out of TeamCityDave Parks
2013-11-06STORM-1980/1983 Add debug setting UISndRestart and value. This UUID will nee...Jonathan Yap
2013-11-05STORM-=1982 Remove duplicate entry in settings.xmlJonathan Yap
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-09-19Pull from lindenlab/viewer-releaseMerov Linden
2013-09-18The unbearable lightness of being norspecGraham Linden
2013-09-17MAINT-3161 : Clean up avatar muting code and prototype featuresimon
2013-09-03ACME-789: Remove SLShareHost setting from settings.xmlGilbert Gonzales
2013-08-28merging viewer releaseGilbert Gonzales
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-26Merge the CHUIstorm 3.6.5Graham Linden
2013-08-26merge changes for 3.6.4-releaseOz Linden
2013-08-22merging viewer releaseGilbert Gonzales
2013-08-20merge changes for 3.6.3-releaseOz Linden
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-08-19Merge in viewer-releaseGraham Linden
2013-10-23Merge latest viewer-release with FBCsimon
2013-09-19Merge downstream codesimon_linden
2013-08-26Merge downstream code for CHUIStormsimon
2013-08-20MAINT-3005 FIXED Set max persistent notifications to reduce log-in timemaxim@mnikolenko
2013-08-13added read_from_master parameter for ACME-829Cho
2013-08-09Removing rogue debugAura Linden
2013-08-07merge changes for DRTVWR-333Oz Linden
2013-08-02Switching SLShareHost to pdp locationGilbert Gonzales
2013-08-01ACME: add SLShareHost variable to settings.xml, which allows changing the fb ...Gilbert Gonzales
2013-07-25VITA test framework - record events supportJeff (Gioffredo Linden)
2013-07-22Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2013-07-21NORSPEC-311 NORSPEC-312 remove unused shader and correct default for display ...Graham Linden
2013-07-21NORSPEC-311 fix alpha / opaque lighting diffsGraham Linden
2013-07-15Pull merge from lindenlab/viewer-releaseMerov Linden
2013-07-15merge changes for CHOP-963Oz Linden
2013-07-15NORSPEC-291 WIP clean-up and make materials rendering underwater a runtime se...Graham Linden
2013-07-13CHOP-963: Add a new --update-service command line argument for QA useOz Linden
2013-07-11MAINT-2879 : Viewer should revoke animation permissions with "Stop Animating Me"simon
2013-07-02CHOP-959: Introduce CmdLineChannel settings var, map --channel to it.Nat Goodspeed
2013-07-02CHOP-959: Introduce CmdLineLoginLocation var for --url and --slurl.Nat Goodspeed
2013-07-01CHOP-959: Introduce and use settings vars for some cmd_line switches.Nat Goodspeed
2013-06-28Merge with viewer-bear which was just merged with viewer-releasecallum_linden
2013-06-28merge changes for 3.6.1-releaseOz Linden
2013-06-27Merge with viewer-releasecallum_linden
2013-06-27CHOP-959: Make settings.xml actually valid XML LLSD.Nat Goodspeed