From 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 Mon Sep 17 00:00:00 2001 From: Monroe Williams Date: Thu, 2 Aug 2007 01:18:34 +0000 Subject: 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 --- indra/newview/llviewerparcelmgr.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'indra/newview/llviewerparcelmgr.cpp') 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 { -- cgit v1.3