summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-11 11:19:51 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-11 11:19:51 +0000
commit44cfa948c7a8bf6786b204c35973ac879cdfc491 (patch)
treec34ec0cc9e0c73a72071463d71caa068d2af2659 /indra/newview/app_settings
parenta4ef5e2b0d4e36aa98f2e4074f4ddd4cad3d3106 (diff)
parentfc1af768b800c890cda8ef3e8b9ee2537ca1d92a (diff)
merge.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/ignorable_dialogs.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/ignorable_dialogs.xml b/indra/newview/app_settings/ignorable_dialogs.xml
index e825f13e82..d0e1f62a84 100644
--- a/indra/newview/app_settings/ignorable_dialogs.xml
+++ b/indra/newview/app_settings/ignorable_dialogs.xml
@@ -177,17 +177,6 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>FirstStreamingMedia</key>
- <map>
- <key>Comment</key>
- <string>Enables FirstStreamingMedia warning dialog</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>FirstTeleport</key>
<map>
<key>Comment</key>