From de11ebefe905f011b4e8f38f8f9ed8832bdb87e8 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 29 Oct 2010 16:50:09 -0700 Subject: EXP-359 WIP Disable MOAP fixed AudioStreamingMusic and AudioStreamingMedia so they are independent this way we can keep audio on but disable html content --- indra/newview/llviewerparcelmgr.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 3c9e351ca1..a2f6f67b4d 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1784,8 +1784,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use void optionally_start_music(const std::string& music_url) { - if (gSavedSettings.getBOOL("AudioStreamingMusic") && - gSavedSettings.getBOOL("AudioStreamingMedia")) + if (gSavedSettings.getBOOL("AudioStreamingMusic")) { // only play music when you enter a new parcel if the UI control for this // was not *explicitly* stopped by the user. (part of SL-4878) -- cgit v1.2.3