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 /indra/newview/llviewerparcelmedia.cpp | |
| parent | 541e0b1dfce8ecffdaaf444f0e0ae02ca28c9323 (diff) | |
DEV-34720 Mute all
DEV-34721 "Streaming Media" checkbox
DEV-34723 Mouse sensitivity slider
Reviewed by James
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmedia.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 |