From 5fbf81d17eae532da6d9537401bd677eb04c90ff Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 25 Feb 2010 01:00:50 +0800
Subject: EXT-5410 Streaming audio does ignores preference setting.

---
 indra/newview/llviewermedia.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llviewermedia.cpp')

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())
 			{
-- 
cgit v1.3