summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-12-15 17:04:09 -0800
committerRick Pasetto <rick@lindenlab.com>2009-12-15 17:04:09 -0800
commitfc40740e1e5a7fcb1ed8bf3b4b6eaffe7d3d9c07 (patch)
tree3671b214d1a2608a278cac07e3a3ef2a752a7020 /indra/newview/app_settings/settings.xml
parente62ee60e11b0056cb38ec180d1e4ee3891636177 (diff)
Add a PrimMediaMasterEnabled debug flag to allow us to disable the media data client
Conceptually reviewed by Monroe
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-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 f00b100217..9dfce27fad 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5471,6 +5471,17 @@
<key>Value</key>
<integer>13</integer>
</map>
+ <key>PrimMediaMasterEnabled</key>
+ <map>
+ <key>Comment</key>
+ <string>Whether or not Media on a Prim is enabled.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>PrimMediaControlsUseHoverControlSet</key>
<map>
<key>Comment</key>