diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
| commit | e61a10ec5b6b84fcb5c27e8e308022d0094f8736 (patch) | |
| tree | bcf6152629edb1b2548af039bd89b6b573e1e514 /indra/newview/lloverlaybar.cpp | |
| parent | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (diff) | |
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/lloverlaybar.cpp')
| -rw-r--r-- | indra/newview/lloverlaybar.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp index 32ae42363b..27de489446 100644 --- a/indra/newview/lloverlaybar.cpp +++ b/indra/newview/lloverlaybar.cpp @@ -308,27 +308,6 @@ void LLOverlayBar::refresh() { mMusicRemote->setVisible(TRUE); mMusicRemote->setEnabled(TRUE); - - S32 musicPlaying = gAudiop->isInternetStreamPlaying(); - - if ( musicPlaying == 0 ) // stopped - { - mMusicRemote->setTransportState ( LLMediaRemoteCtrl::Stop, FALSE ); - } - else - if ( musicPlaying == 1 ) // playing - { - mMusicRemote->setTransportState ( LLMediaRemoteCtrl::Play, FALSE ); - if (gAudiop) - { - gAudiop->setInternetStreamGain ( gSavedSettings.getF32 ( "AudioLevelMusic" ) ); - } - } - else - if ( musicPlaying == 2 ) // paused - { - mMusicRemote->setTransportState ( LLMediaRemoteCtrl::Stop, FALSE ); - } } } |