summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-09-06 17:00:55 -0400
committerOz Linden <oz@lindenlab.com>2011-09-06 17:00:55 -0400
commit82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (patch)
tree779821c923eca8413bf7e21fd699b1af3ef7e6f3 /indra/newview/app_settings
parente2dea0b4947a1b0fefc1ddbe33ac74776128d1c5 (diff)
parentfc45e9cbf6ea74412acd8bb55098cfd15493292b (diff)
merge changes for storm-1588
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 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>