diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-01-06 12:34:02 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-01-06 12:34:02 -0500 |
| commit | d9b8f65c03130f659ed0d036a9c542700a84b766 (patch) | |
| tree | d50256ac783f1b3401eb32e67d4f3a14a90e672e /indra/newview/app_settings/ignorable_dialogs.xml | |
| parent | cdb158e9e0cff7070bb68c721cec0e90b0030fb2 (diff) | |
| parent | 447a908a0a46e6e0ad6ac5e8a3a26260d865243b (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/app_settings/ignorable_dialogs.xml')
| -rw-r--r-- | indra/newview/app_settings/ignorable_dialogs.xml | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/indra/newview/app_settings/ignorable_dialogs.xml b/indra/newview/app_settings/ignorable_dialogs.xml index ab18febccc..e825f13e82 100644 --- a/indra/newview/app_settings/ignorable_dialogs.xml +++ b/indra/newview/app_settings/ignorable_dialogs.xml @@ -177,21 +177,10 @@ <key>Value</key> <integer>1</integer> </map> - <key>FirstStreamingMusic</key> + <key>FirstStreamingMedia</key> <map> <key>Comment</key> - <string>Enables FirstStreamingMusic warning dialog</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>FirstStreamingVideo</key> - <map> - <key>Comment</key> - <string>Enables FirstStreamingVideo warning dialog</string> + <string>Enables FirstStreamingMedia warning dialog</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |