From 50a99d5419cd0ea9fe3375726bdc6a34e8102824 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Mon, 22 Feb 2010 19:04:27 -0800
Subject: FIX (unposted bug): "hasMedia" and "hasAudio" no longer checks
 preferences: it's now up to callers to decide to do that Review #137

---
 indra/newview/llviewermedia.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index b066db6307..0f785079a6 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -972,7 +972,6 @@ bool LLViewerMedia::isParcelAudioPlaying()
 
 bool LLViewerMedia::hasInWorldMedia()
 {
-	if (! gSavedSettings.getBOOL("AudioStreamingMedia")) return false;
 	if (sInWorldMediaDisabled) return false;
 	impl_list::iterator iter = sViewerMediaImplList.begin();
 	impl_list::iterator end = sViewerMediaImplList.end();
@@ -993,14 +992,14 @@ bool LLViewerMedia::hasInWorldMedia()
 // static
 bool LLViewerMedia::hasParcelMedia()
 {
-	return gSavedSettings.getBOOL("AudioStreamingMedia") && !LLViewerParcelMedia::getURL().empty();
+	return !LLViewerParcelMedia::getURL().empty();
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // static
 bool LLViewerMedia::hasParcelAudio()
 {
-	return gSavedSettings.getBOOL("AudioStreamingMedia") && !LLViewerMedia::getParcelAudioURL().empty();
+	return !LLViewerMedia::getParcelAudioURL().empty();
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3