summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-02-09 13:47:13 -0800
committerRick Pasetto <rick@lindenlab.com>2010-02-09 13:47:13 -0800
commit3aa7e1b0c10fcb660cfc13308dd2a45223696e11 (patch)
tree6ca14e85d336043b434fc1b9333a2c349d2c6220 /indra/newview/app_settings/settings.xml
parentcf09a48bb21d553c837186cc2e7198801f06691a (diff)
PARTIAL EXT-5261: add new "MediaTentativeAutoPlay" setting
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 40ac49597d..02b34df4c6 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4611,6 +4611,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>MediaTentativeAutoPlay</key>
+ <map>
+ <key>Comment</key>
+ <string>This is a tentative flag that may be temporarily set off by the user, until she teleports</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>MemoryLogFrequency</key>
<map>
<key>Comment</key>