livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-4295: Added missing parcel audio streaming fading to parcel audio button in status bar

Ansariel 2012-10-19 15:35:56 +02:00
parent 0eac4445a6
commit 59486c2cb8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llstatusbar.cpp
View File

@ -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.