diff options
| author | Jiao Li <angela@lindenlab.com> | 2009-07-07 10:27:50 +0000 |
|---|---|---|
| committer | Jiao Li <angela@lindenlab.com> | 2009-07-07 10:27:50 +0000 |
| commit | 9eeda70f1244230078c565392223c252c9c76e7b (patch) | |
| tree | cf271a9637f83ecd7d084edaa7ce87914142d3ce | |
| parent | 541e0b1dfce8ecffdaaf444f0e0ae02ca28c9323 (diff) | |
DEV-34720 Mute all
DEV-34721 "Streaming Media" checkbox
DEV-34723 Mouse sensitivity slider
Reviewed by James
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llviewerparcelmedia.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 38eeca2bf8..ffe58276b1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -276,6 +276,17 @@ <key>Value</key> <real>0.5</real> </map> + <key>AudioStreaming</key> + <map> + <key>Comment</key> + <string>Enable streaming</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>AudioStreamingMusic</key> <map> <key>Comment</key> diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index 08e03c97f2..57f7239a91 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -208,7 +208,7 @@ void LLViewerParcelMedia::play(LLParcel* parcel) if (!parcel) return; - if (!gSavedSettings.getBOOL("AudioStreamingVideo")) + if (!gSavedSettings.getBOOL("AudioStreaming") || !gSavedSettings.getBOOL("AudioStreamingVideo")) return; std::string media_url = parcel->getMediaURL(); @@ -389,6 +389,8 @@ bool callback_play_media(const LLSD& notification, const LLSD& response, LLParce if (option == 0) { gSavedSettings.setBOOL("AudioStreamingVideo", TRUE); + if(!gSavedSettings.getBOOL("AudioStreaming")) + gSavedSettings.setBOOL("AudioStreaming", TRUE); LLViewerParcelMedia::play(parcel); } else diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index bcb3853106..dc9b26eedc 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1710,7 +1710,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use void optionally_start_music(const std::string& music_url) { - if (gSavedSettings.getBOOL("AudioStreamingMusic")) + if (gSavedSettings.getBOOL("AudioStreamingMusic") && gSavedSettings.getBOOL("AudioStreaming")) { // Make the user click the start button on the overlay bar. JC // llinfos << "Starting parcel music " << music_url << llendl; |