2 files changed, 27 insertions, 23 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 0be529f..92e2014 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -1893,20 +1893,32 @@ Try selecting a single parcel.
                         Region Not Found
                 </message>
         </alert>
-        <alert modal="true" name="ParcelCanPlayMedia">
-                <message name="message">
-                        This location can play streaming media. 
-Streaming media requires a fast Internet connection.
- 
-Play streaming media when available?
-(You can change this option later under 
-Preferences &gt; Audio &amp; Video.)
-                </message>
+  <alert modal="true" name="ParcelCanPlayMusic">
+    <message name="message">
+      This location wants to play streaming music.
+      (Requires a fast Internet connection.)
+
+      Play streaming music now?
+    </message>
+    <option name="PlayMusic">
+      Yes
+    </option>
+    <option name="No">
+      No
+    </option>
+  </alert>
+  <alert modal="true" name="ParcelCanPlayMedia">
+    <message name="message">
+      This location wants to play streaming media.
+      (Requires a fast Internet connection.)
+
+      Play streaming media now?
+    </message>
                 <option name="PlayMedia">
-                        Play Media
+                        Yes
                 </option>
-                <option name="Disable">
-                        Disable
+                <option name="No">
+                        No
                 </option>
         </alert>
         <alert modal="true" name="CannotDeedLandWaitingForServer">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
index a8ecfca..7e4f12a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
@@ -4,7 +4,7 @@
      name="media_controls" width="262">
         <icon bottom="-22" enabled="true" follows="left|top" height="22"
              image_name="icn_label_music.tga" label="" left_delta="2" mouse_opaque="true"
-             name="music_icon" scale_image="true" tool_tip="Play/pause streaming music"
+             name="music_icon" scale_image="true" tool_tip="Play streaming music"
              width="20" />
         <button bottom="-21" enabled="true" follows="left|top" height="20"
           image_overlay="icn_play.tga"
@@ -13,15 +13,7 @@
              image_disabled="flyout_btn_left_disabled.tga"
               label="" left_delta="20"
              mouse_opaque="true" name="music_play" scale_image="true" toggle="false"
-             tool_tip="Play/pause streaming music" width="20" />
-  <button bottom="-21" enabled="false" follows="left|top" height="20"
-             image_overlay="icn_pause.tga"
-             image_unselected="flyout_btn_left.tga"
-             image_selected="flyout_btn_left_selected.tga"
-             image_disabled="flyout_btn_left_disabled.tga"
-             label="" left_delta="0"
-             mouse_opaque="true" name="music_pause" scale_image="true" toggle="false"
-             tool_tip="Pause streaming music" width="20" />
+             tool_tip="Play streaming music" width="20" />
   <button bottom="-21" enabled="true" follows="left|top" height="20"
              image_overlay="icn_stop.tga"
              image_unselected="flyout_btn_right.tga"
@@ -33,7 +25,7 @@
   <icon bottom="-22" enabled="true" follows="left|top" height="22"
              image_name="icn_label_media.tga"
              label="" left_delta="23" mouse_opaque="true"
-             name="media_icon" scale_image="true" tool_tip="Play/pause streaming music"
+             name="media_icon" scale_image="true" tool_tip="Play/pause streaming media"
              width="20" />
   <button bottom="-21" enabled="true" follows="left|top" height="20"
              image_overlay="icn_play.tga"