diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-03 17:10:43 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-03 17:10:43 +0200 |
| commit | f838c5d3ae25e90dba80817f98b50df3e58a4010 (patch) | |
| tree | 0c80900206ac15dad0e923264a844ae002d99251 /indra/newview/lloverlaybar.cpp | |
| parent | 3b05656ba1f698535453622267996df14fef3dde (diff) | |
| parent | 67f11add9c2e05e1c86e30c44c94ee1b7d9205d0 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
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(); |