diff options
| author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-11 10:08:37 -0800 |
|---|---|---|
| committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-11 10:08:37 -0800 |
| commit | 941497dd30c409a2f352b0bfc1c48bfaca5ea76e (patch) | |
| tree | ed7bdc596ee0a856f9739864239f75c64db85f50 /indra/newview/lloverlaybar.cpp | |
| parent | 4b710367a1ac986e8be731bc391c0b375424148f (diff) | |
| parent | 0a8d9fa5b5d044bed7d4c38ec51d87bc90f3b3a6 (diff) | |
merge
Diffstat (limited to 'indra/newview/lloverlaybar.cpp')
| -rw-r--r-- | indra/newview/lloverlaybar.cpp | 9 |
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(); |