summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-08-31 11:51:38 -0700
committerRichard Nelson <richard@lindenlab.com>2011-08-31 11:51:38 -0700
commit2154bccdc4ef79bc2d593daad85d1344e9177bcf (patch)
treedf202d7f19616648be5680ff145fd281c5d21f69 /indra/newview/app_settings
parente62a4d4ec151e81f4dc68b29a009596d3d154d57 (diff)
parent09394d3a9d72c701fe28c54d7c76d71ddf3ef765 (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.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 43aa67e949..40643b514e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5481,6 +5481,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>