summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-12-07 10:40:12 -0800
committerJames Cook <james@lindenlab.com>2009-12-07 10:40:12 -0800
commit864dd45b2b8dec32552112ed76246c9b0b3f7f0b (patch)
treede5ce187a9b26f67d2515fa140aa8d313e64a51d /indra/newview/app_settings
parent5d4959e3a107a6a40014528dd8e17e46bf128540 (diff)
parent7ff7709f9fd07de5cc9b039562d0fe3794f6ce36 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 76bc9b1d57..b301d784f9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -386,17 +386,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>AutoPlayMedia</key>
- <map>
- <key>Comment</key>
- <string>Allow media objects to automatically play or navigate?</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>AutoSnapshot</key>
<map>
<key>Comment</key>