1 files changed, 6 insertions, 6 deletions

diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index b99b0c0..11ab647 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -85,7 +85,7 @@ LLPointer<LLViewerImage> sBlockedImage;
 LLPointer<LLViewerImage> sPassImage;
 
 // Local functions
-void optionally_start_music(const std::string& music_url);
+void optionally_start_music(LLParcel* parcel);
 void callback_start_music(S32 option, void* data);
 void optionally_prepare_video(const LLParcel *parcelp);
 void callback_prepare_video(S32 option, void* data);
@@ -1706,7 +1706,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
                                         {
                                                 if (music_url.substr(0,7) == "http://")
                                                 {
-                                                        optionally_start_music(music_url);
+                                                        optionally_start_music(parcel);
                                                 }
                                         }
                                         else if (!gAudioStream->getInternetStreamURL().empty())
@@ -1728,18 +1728,18 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
         };
 }
 
-void optionally_start_music(const std::string& music_url)
+void optionally_start_music(LLParcel* parcel)
 {
         if (gSavedSettings.getBOOL("AudioStreamingMusic"))
         {
                 // Make the user click the start button on the overlay bar. JC
-                //              llinfos << "Starting parcel music " << music_url << llendl;
+                //              llinfos << "Starting parcel music " << parcel->getMusicURL() << llendl;
 
                 // 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 && gOverlayBar->musicPlaying())
+                if (gOverlayBar && gOverlayBar->musicPlaying())
                 {
-                        gAudioStream->startInternetStream(music_url);
+                        LLViewerParcelMedia::playStreamingMusic(parcel);
                 }
         }
 }