diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-05 19:04:45 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-05 19:04:45 -0800 |
| commit | 0c91cfc49c88b729df60d1b20da175f35a7377fe (patch) | |
| tree | 8b3309d86ba9aa1a39c5ea6a718e7479fd848acb /indra/newview/app_settings | |
| parent | 34191fcc2c2e54921febd087f781c51899bc2442 (diff) | |
Lots of fixes to parcel audio playing/stopping/autoplaying/firstuse policy.
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/ignorable_dialogs.xml | 15 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 |
2 files changed, 3 insertions, 14 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> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 359f4abe56..82ca4df7c8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -285,7 +285,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>AudioStreamingMusic</key> <map> |