From 59486c2cb8ff8d77d07d09f3f45f8f90676588ec Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 19 Oct 2012 15:35:56 +0200
Subject: [PATCH] FIRE-4295: Added missing parcel audio streaming fading to
 parcel audio button in status bar

---
 indra/newview/llstatusbar.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 0775a516e5..845db463c5 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -102,6 +102,7 @@
 #include <iomanip>
 
 #include "llpanelpathfindingrebakenavmesh.h"	// <FS:Zi> Pathfinding rebake functions
+#include "llvieweraudio.h"
 
 //
 // Globals
@@ -803,7 +804,7 @@ void LLStatusBar::toggleStream(bool enable)
 		{
 			// 'false' means unpause
 			//gAudiop->pauseInternetStream(false);
-			gAudiop->startInternetStream(LLViewerMedia::getParcelAudioURL());
+			LLViewerAudio::getInstance()->startInternetStreamWithAutoFade(LLViewerMedia::getParcelAudioURL());
 		}
 		else
 		{
@@ -813,13 +814,13 @@ void LLStatusBar::toggleStream(bool enable)
 			}
 			else
 			{
-				gAudiop->startInternetStream(LLViewerMedia::getParcelAudioURL());
+				LLViewerAudio::getInstance()->startInternetStreamWithAutoFade(LLViewerMedia::getParcelAudioURL());
 			}
 		}
 	}
 	else
 	{
-		gAudiop->stopInternetStream();
+		LLViewerAudio::getInstance()->stopInternetStreamWithAutoFade();
 	}
 
 	// <FS:Zi> Split up handling cont.