From 25d2459d1edca72b151247faefe7a8f08b3c6b69 Mon Sep 17 00:00:00 2001 From: Cinders Date: Sun, 23 Dec 2012 15:05:35 -0700 Subject: [PATCH] Fix FIRE-8419: Don't return on identical stream URIs. We might need to toggle off/on a closed stream. Identical streams are handled elsewhere anyways. --- indra/newview/llvieweraudio.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp index d8382fc84e..f737eba69c 100644 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -82,7 +82,11 @@ void LLViewerAudio::startInternetStreamWithAutoFade(std::string streamURI) // Old and new stream are identical if (mNextStreamURI == streamURI) { - return; + /// FIRE-8419 - Don't return here. It can keep the user from toggling audio streams off/on. + /// We handle identical stream URIs with FIRE-7093 anyways. + //return; + lldebugs << "Identical URI's: " << mNextStreamURI << " and " << streamURI << llendl; + // } // Record the URI we are going to be switching to