diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9421f46b1a..6193599e2e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -22644,6 +22644,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>511</integer>
     </map>
+    <key>FSParcelMusicAutoPlay</key>
+    <map>
+      <key>Comment</key>
+      <string>Auto play parcel music when available</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
 </map>
 </llsd>
 
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index dd2179c2cd..42845ea016 100755
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1849,11 +1849,17 @@ void LLViewerParcelMgr::optionally_start_music(const std::string& music_url)
 	{
 		// 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();
-		if (gStatusBar->getAudioStreamEnabled() || 	// ## Zi: Media/Stream separation
+		// <FS> Media/Stream separation
+		//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...
+		//    (!nearby_media_panel &&
+		//     gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) &&
+		if (gStatusBar->getAudioStreamEnabled() ||
 		    // 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("FSParcelMusicAutoPlay") &&
+		// </FS>
 			 gSavedSettings.getBOOL("MediaTentativeAutoPlay")))
 		{
 			if (gSavedSettings.getBOOL("MediaEnableFilter"))
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
index c7b54dfc5a..b353145d4e 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
@@ -19,7 +19,8 @@
 		<check_box label="Aktiviert" name="enable_media"/>
 		<slider label="Voice-Chat" name="Voice Volume"/>
 		<check_box label="Aktiviert" name="enable_voice_check_volume"/>
-		<check_box label="Automatische Wiedergabe zulassen" name="media_auto_play_btn" tool_tip="Hier aktivieren, um Medien automatisch wiederzugeben."/>
+		<check_box label="Automatische Audio-Wiedergabe zulassen" name="audio_auto_play_btn" tool_tip="Hier aktivieren, um Audio-Streams automatisch wiederzugeben."/>
+		<check_box label="Automatische Medien-Wiedergabe zulassen" name="media_auto_play_btn" tool_tip="Hier aktivieren, um Medien automatisch wiederzugeben."/>
 		<check_box name="media_allowscript_btn" tool_tip="Erlaubt bzw. verbietet Scripten die Kontrolle über die Medienwiedergabe" label="Skripte erlauben Medien abzuspielen" />
 		<check_box label="Medien, die an andere Avatare angehängt sind, wiedergeben." name="media_show_on_others_btn" tool_tip="Diese Option deaktivieren, um Medien für andere Avataren, die sich in der Nähe befinden, auszublenden."/>
 		<check_box name="media_filter" tool_tip="Aktiviert den Medienfilter, der abhängig der Medien-URL die Wiedergabe erlaubt oder verbietet." label="Medienfilter aktivieren (erhöhte Sicherheit)"/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 8b866b27fc..0a3c3f0e8c 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -50,7 +50,7 @@
          name="System Volume"
          show_text="false"
          slider_label.halign="right"
-         top="10"
+         top="5"
          volume="true"
          width="300">
             <slider.commit_callback
@@ -172,7 +172,7 @@
          left="0"
          name="SFX Volume"
          show_text="false"
-         top_pad="4"
+         top_pad="2"
          volume="true"
          width="300">
             <slider.commit_callback
@@ -220,7 +220,7 @@
          name="Music Volume"
          slider_label.halign="right"
          show_text="false"
-         top_pad="4"
+         top_pad="2"
          volume="true"
          width="300">
             <slider.commit_callback
@@ -266,7 +266,7 @@
          name="Media Volume"
          show_text="false"
          slider_label.halign="right"
-         top_pad="4"
+         top_pad="2"
          volume="true"
          width="300">
             <slider.commit_callback
@@ -311,7 +311,7 @@
          label_width="120"
          layout="topleft"
          left="0"
-         top_pad="4"
+         top_pad="2"
          name="Voice Volume"
          show_text="false"
          slider_label.halign="right"
@@ -347,6 +347,17 @@
          name="enable_voice_check_volume"
          width="110"/>
 
+        <check_box
+         name="audio_auto_play_btn"
+         control_name="FSParcelMusicAutoPlay"
+         enabled_control="AudioStreamingMedia"
+         layout="topleft"
+         height="16"
+         width="230"
+         tool_tip="Check this to automatically start audio streams."
+         label="Allow Audio to auto-play"
+         top_pad="5"
+         left="25"/>
         <check_box
          name="media_auto_play_btn"
          control_name="ParcelMediaAutoPlayEnable"
@@ -354,9 +365,9 @@
          layout="topleft"
          height="16"
          width="230"
-         tool_tip="Check this to automatically start media when you log in or change regions."
-         label="Allow Media to auto-play when entering a region"
-         top_pad="5"
+         tool_tip="Check this to automatically start media."
+         label="Allow Media to auto-play"
+         top_pad="1"
          left="25"/>
         <check_box
          name="media_allowscript_btn"