EXT-5270: Implement "dynamic" controls based on the selected item in Nearby Media

Review #112
This change adds controls that change state based on the selection in the nearby media panel. There are basically 3 sets:
- Time-based
- Web-based ("Normal")
- Disabled

Again, these change based on what you've got selected in the panel

1 files changed, 2 insertions, 1 deletions

diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 0c0936c103..1f6bbcbae8 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1800,7 +1800,8 @@ void optionally_start_music(const std::string& music_url)
 		     nearby_media_panel->getParcelAudioAutoStart()) ||
 		    // or they have expressed no opinion in the UI, but have autoplay on...
 		    (!nearby_media_panel &&
-		     gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING)))
+		     gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) &&
+			 gSavedSettings.getBOOL("MediaTentativeAutoPlay")))
 		{
 			llinfos << "Starting parcel music " << music_url << llendl;
 			gAudiop->startInternetStream(music_url);