diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-03 12:10:00 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-03 12:10:00 -0800 |
| commit | e47d107e2f7c4793f0685aa37749629f7d91aef0 (patch) | |
| tree | 740e36a63f6576bdf5c180ca8b59796ae5f1cf49 /indra/newview/llviewermedia.cpp | |
| parent | ece36d5df8d0a7fb4c71ec50a0bac49a5c6fbacb (diff) | |
| parent | 2ecc98cb2f11b03224990d498d20cff8bcfb0716 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 86336e353c..344c4c469b 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -851,7 +851,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg) } } // update the audio stream here as well - if(!inworld_media_enabled || !inworld_audio_enabled) + if( !inworld_audio_enabled) { if(LLViewerMedia::isParcelAudioPlaying() && gAudiop && LLViewerMedia::hasParcelAudio()) { |