summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-12-04 16:14:49 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-12-04 16:14:49 +0200
commit5fac7f1d35336890d99333500da26c56643e5dc7 (patch)
tree4c20d799552195d0827ad76a978cfaafc0c3025d /indra/newview/app_settings/settings.xml
parent63cebc3ae05c952d538d17e392ebeb98c2e86cfb (diff)
parent25b6b5929e4a74023150d729c85b54ae2726c21d (diff)
Merge from default branch.
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-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 fa4dfe767b..6252bd002e 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>