diff options
author | Richard Linden <none@none> | 2011-09-02 20:24:06 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-09-02 20:24:06 -0700 |
commit | fc45e9cbf6ea74412acd8bb55098cfd15493292b (patch) | |
tree | 27c697035feb1d5d7e6de07e9834d49271b5b1ee /indra/newview/app_settings | |
parent | 0ab6eee0996c78d32b722157140cea5a21a5e460 (diff) | |
parent | 1836dd12c9b45e90aeab095dd4cc3e9cdcaf2190 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0996f75fbb..6ebb0162a4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5503,6 +5503,17 @@ <key>Value</key> <real>60.0</real> </map> + <key>MediaPluginDebugging</key> + <map> + <key>Comment</key> + <string>Turn on debugging messages that may help diagnosing media issues (WARNING: May reduce performance).</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>MediaControlFadeTime</key> <map> <key>Comment</key> |