diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
| commit | 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch) | |
| tree | 3c34a3a180b5275bd4166b0056765c5868f56447 /indra/newview/llviewerparcelmgr.cpp | |
| parent | f6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff) | |
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index ed97cd3ec2..017641b278 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1772,13 +1772,10 @@ void optionally_start_music(const LLString& music_url) // now only play music when you enter a new parcel if the control is in PLAY state // changed as part of SL-4878 - if ( gOverlayBar->getMusicRemoteControl ()->getTransportState () == LLMediaRemoteCtrl::Play ) + if ( gOverlayBar && gOverlayBar->musicPlaying() ) { - if (gAudiop) - { - gAudiop->startInternetStream(music_url.c_str()); - } - }; + LLOverlayBar::musicPlay(NULL); + } } } @@ -1791,12 +1788,7 @@ void callback_start_music(S32 option, void* data) { gSavedSettings.setBOOL("AudioStreamingMusic", TRUE); llinfos << "Starting first parcel music " << music_url << llendl; - if (gAudiop) - { - gAudiop->startInternetStream(music_url->c_str()); - LLMediaRemoteCtrl* ctrl = gOverlayBar->getMusicRemoteControl(); - ctrl->setTransportState( LLMediaRemoteCtrl::Play, FALSE ); - } + LLOverlayBar::musicPlay(NULL); } else { |