summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-10 14:51:39 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-10 14:51:39 +0000
commit56d43b9c79ede83c563c4d6d1f60ea831926e1ac (patch)
tree9ae0595dfdbbd4ff22a93f2e48ad49e1060ca802 /indra/newview/app_settings
parenta4ef5e2b0d4e36aa98f2e4074f4ddd4cad3d3106 (diff)
parent15825cb8992ce692172907714c7cd64a48ed5fa4 (diff)
merge from viewer2 trunk.
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>