summaryrefslogtreecommitdiff
path: root/indra/newview/lloverlaybar.cpp
diff options
context:
space:
mode:
authorskolb <none@none>2009-12-01 18:10:45 -0800
committerskolb <none@none>2009-12-01 18:10:45 -0800
commitfc56add7930283a8bc451d96b46749fb82d631d4 (patch)
tree29ba48a398a23248eaeec918e9b7fa60e0973320 /indra/newview/lloverlaybar.cpp
parenta0c133f819b7b6043e39a39a02310cd1fad67859 (diff)
EXT-3033 Streaming audio is completely broken in Viewer 2.0
Diffstat (limited to 'indra/newview/lloverlaybar.cpp')
-rw-r--r--indra/newview/lloverlaybar.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp
index ea24638b6d..67e048885f 100644
--- a/indra/newview/lloverlaybar.cpp
+++ b/indra/newview/lloverlaybar.cpp
@@ -349,14 +349,8 @@ void LLOverlayBar::toggleMediaPlay(void*)
//static
void LLOverlayBar::toggleMusicPlay(void*)
{
- if (!gOverlayBar)
- {
- return;
- }
-
- if (gOverlayBar->mMusicState != PLAYING)
+ if (gAudiop->isInternetStreamPlaying() != 1)
{
- gOverlayBar->mMusicState = PLAYING; // desired state
if (gAudiop)
{
LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
@@ -381,7 +375,6 @@ void LLOverlayBar::toggleMusicPlay(void*)
//}
else
{
- gOverlayBar->mMusicState = STOPPED; // desired state
if (gAudiop)
{
gAudiop->stopInternetStream();