diff options
| author | angela <angela@lindenlab.com> | 2010-02-23 11:44:56 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-23 11:44:56 +0800 |
| commit | e98d6a910a39671225f1af627570aee58517ea7f (patch) | |
| tree | 9d0d28c80be1fd23166061e20bfce3d15a924e33 /indra/newview/llviewermedia.cpp | |
| parent | 0eea585ef13426bf343fb5bcc3642cdfc769c022 (diff) | |
| parent | 37291bea8d9b5a626b449d984856e280e159ac5c (diff) | |
merg and resolve conflicts
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index f1ca56a8ae..86336e353c 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -952,7 +952,10 @@ void LLViewerMedia::setAllMediaEnabled(bool val) LLViewerParcelMedia::play(LLViewerParcelMgr::getInstance()->getAgentParcel()); } - if (!LLViewerMedia::isParcelAudioPlaying() && gAudiop && LLViewerMedia::hasParcelAudio()) + if (gSavedSettings.getBOOL("AudioStreamingMusic") && + !LLViewerMedia::isParcelAudioPlaying() && + gAudiop && + LLViewerMedia::hasParcelAudio()) { gAudiop->startInternetStream(LLViewerMedia::getParcelAudioURL()); } |