Commits

Anonymous committed 50ce47d

STORM-1812 Tweak how music is restarted for teleport within a parcel

  • Participants
  • Parent commits a37a190

Comments (0)

Files changed (3)

File indra/newview/llpanelnearbymedia.cpp

 {
 	// update mParcelAudioAutoStart if AUTO_PLAY_MEDIA_SETTING changes
 	mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) &&
-							gSavedSettings.getBOOL("MediaTentativeAutoPlay");							
+							gSavedSettings.getBOOL("MediaTentativeAutoPlay");
 }
 
 /*virtual*/

File indra/newview/llvieweraudio.cpp

 		LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 		if (parcel)
 		{
-			LLViewerParcelMgr::optionally_start_music(parcel->getMusicURL());
+			mNextStreamURI = parcel->getMusicURL();
 		}
 	}
 }

File indra/newview/llviewerparcelmgr.cpp

 	{
 		// only play music when you enter a new parcel if the UI control for this
 		// was not *explicitly* stopped by the user. (part of SL-4878)
-		LLPanelNearByMedia* nearby_media_panel = gStatusBar->getNearbyMediaPanel();;
+		LLPanelNearByMedia* nearby_media_panel = gStatusBar->getNearbyMediaPanel();
 		if ((nearby_media_panel &&
 		     nearby_media_panel->getParcelAudioAutoStart()) ||
 		    // or they have expressed no opinion in the UI, but have autoplay on...