Merge commit 'mccabe/next' into next

15 files changed, 200 insertions, 156 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 779b668..7405aad 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -284,7 +284,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>1.0</real>
+      <real>0.5</real>
     </map>
     <key>AudioLevelUI</key>
     <map>
@@ -317,7 +317,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>AudioStreamingVideo</key>
     <map>
@@ -328,7 +328,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>AutoAcceptNewInventory</key>
     <map>
diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index 1b337ab..06978d7 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -85,7 +85,6 @@ BOOL LLMediaRemoteCtrl::postBuild()
         childSetAction("media_stop",LLOverlayBar::mediaStop,this);
         childSetAction("music_stop",LLOverlayBar::toggleMusicPlay,this);
         childSetAction("media_pause",LLOverlayBar::toggleMediaPlay,this);
-        childSetAction("music_pause",LLOverlayBar::toggleMusicPlay,this);
 
         childSetAction("expand", onClickExpandBtn, this);       
         return TRUE;
@@ -150,7 +149,6 @@ void LLMediaRemoteCtrl::enableMediaButtons()
         bool stop_media_enabled = false;
         bool play_music_enabled = false;
         bool stop_music_enabled = false;
-        bool music_show_pause = false;
         bool media_show_pause = false;
         LLColor4 music_icon_color = LLUI::sColorsGroup->getColor( "IconDisabledColor" );
         LLColor4 media_icon_color = LLUI::sColorsGroup->getColor( "IconDisabledColor" );
@@ -203,17 +201,16 @@ void LLMediaRemoteCtrl::enableMediaButtons()
         
                 if ( parcel && parcel->getMusicURL()[0])
                 {
-                        play_music_enabled = true;
                         music_icon_color = LLUI::sColorsGroup->getColor( "IconEnabledColor" );
 
                         if (gOverlayBar->musicPlaying())
                         {
-                                music_show_pause = true;
+                                play_music_enabled = false;
                                 stop_music_enabled = true;
                         }
                         else
                         {
-                                music_show_pause = false;
+                                play_music_enabled = true;
                                 stop_music_enabled = false;
                         }
                 }
@@ -226,20 +223,19 @@ void LLMediaRemoteCtrl::enableMediaButtons()
                 }
         }
         const std::string media_icon_name = LLMIMETypes::findIcon(media_type);
+
         LLButton* music_play_btn = getChild<LLButton>("music_play");
         LLButton* music_stop_btn = getChild<LLButton>("music_stop");
-        LLButton* music_pause_btn = getChild<LLButton>("music_pause");
+
+        music_play_btn->setEnabled(play_music_enabled);
+        music_stop_btn->setEnabled(stop_music_enabled);
+        childSetColor("music_icon", music_icon_color);
+
         LLButton* media_play_btn = getChild<LLButton>("media_play");
         LLButton* media_stop_btn = getChild<LLButton>("media_stop");
         LLButton* media_pause_btn = getChild<LLButton>("media_pause");
         LLIconCtrl* media_icon = getChild<LLIconCtrl>("media_icon");
 
-        music_play_btn->setEnabled(play_music_enabled);
-        music_stop_btn->setEnabled(stop_music_enabled);
-        music_pause_btn->setEnabled(music_show_pause);
-        music_pause_btn->setVisible(music_show_pause);
-        music_play_btn->setVisible(! music_show_pause);
-        childSetColor("music_icon", music_icon_color);
         if(!media_icon_name.empty())
         {
                 media_icon->setImage(media_icon_name);
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 1087fd8..80cac14 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -275,6 +275,7 @@ void LLOverlayBar::refresh()
         {
                 layoutButtons();
         }
+
 }
 
 //-----------------------------------------------------------------------
@@ -360,6 +361,12 @@ void LLOverlayBar::toggleMediaPlay(void*)
 }
 
 //static
+void LLOverlayBar::musicFirstRun()
+{
+        gOverlayBar->mMusicState = PLAYING;
+}
+
+//static
 void LLOverlayBar::toggleMusicPlay(void*)
 {
         if (!gOverlayBar)
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 5880ff0..73d0a43 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -80,6 +80,9 @@ public:
         static void musicStop(void*);
         static void mediaStop(void*);
 
+        // hack to make sure the music button plays.
+        static void musicFirstRun();
+
         static void toggleAudioVolumeFloater(void*);
 
 protected:      
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index dba603b..01d77f6 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -90,15 +90,7 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
 {
         
         mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this);
-        if (show_keep_discard)
-        {
-                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap());
-                childSetAction("Discard btn",onDiscardBtn,this);
-        }
-        else
-        {
-                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
-        }
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
 
         /*
         childSetCommitCallback("desc_editor", LLPreview::onText, this);
diff --git a/linden/indra/newview/llviewergesture.cpp b/linden/indra/newview/llviewergesture.cpp
index a080663..d99a3a8 100644
--- a/linden/indra/newview/llviewergesture.cpp
+++ b/linden/indra/newview/llviewergesture.cpp
@@ -43,6 +43,7 @@
 #include "llinventorymodel.h"
 #include "llvoavatar.h"
 #include "llxfermanager.h"
+#include "llviewercontrol.h"
 #include "llviewermessage.h" // send_guid_sound_trigger
 #include "llviewernetwork.h"
 #include "llagent.h"
@@ -50,7 +51,7 @@
 // Globals
 LLViewerGestureList gGestureList;
 
-const F32 LLViewerGesture::SOUND_VOLUME = 1.f;
+const F32 LLViewerGesture::SOUND_VOLUME = gSavedSettings.getBOOL("MuteSounds") ?  0.f : 1.f;
 
 LLViewerGesture::LLViewerGesture()
 :       LLGesture()
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index c4cbf84..b7f4a40 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1605,6 +1605,31 @@ void label_touch(std::string& label, void*)
         }
 }
 
+class LLAttachmentEnableTouch : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
+
+                if (!obj) return false;
+                if (!obj->isAttachment()) return false;         
+
+                bool new_value = obj && obj->flagHandleTouch();
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
+
+                if (node && node->mValid && !node->mTouchName.empty())
+                {
+                        gMenuHolder->childSetText("Attachment Touch", node->mTouchName);
+                }
+                else
+                {
+                        gMenuHolder->childSetText("Attachment Touch", userdata["data"].asString());
+                }
+                return true;
+        }
+};
+
 bool handle_object_open()
 {
         LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
@@ -9822,6 +9847,7 @@ void initialize_menus()
 
         addMenu(new LLAttachmentEnableDrop(), "Attachment.EnableDrop");
         addMenu(new LLAttachmentEnableDetach(), "Attachment.EnableDetach");
+        addMenu(new LLAttachmentEnableTouch(), "Attachment.EnableTouch");
 
         // Land pie menu
         addMenu(new LLLandBuild(), "Land.Build");
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 4543ae4..b947f95 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -111,6 +111,7 @@
 #include "llui.h"                       // for make_ui_sound
 #include "lluploaddialog.h"
 #include "llviewercamera.h"
+#include "llviewercontrol.h"
 #include "llviewergenericmessage.h"
 #include "llviewerinventory.h"
 #include "llviewermenu.h"
@@ -3291,6 +3292,9 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
         pos_global.mdV[VY] += pos_local.mV[VY];
         pos_global.mdV[VZ] += pos_local.mV[VZ];
 
+        // Don't play sounds if sound settings are muted.
+        if (gSavedSettings.getBOOL("MuteSounds")) return;
+
         // Don't play a trigger sound if you can't hear it due
         // to parcel "local audio only" settings.
         if (!LLViewerParcelMgr::getInstance()->canHearSound(pos_global)) return;
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index c560ced..cb3afc5 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -2766,7 +2766,7 @@ BOOL LLViewerObject::updateLOD()
         // Update volume of looping sounds
         if (mAudioSourcep && mAudioSourcep->isLoop())
         {
-                F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : (mAudioGain * gSavedSettings.getF32("AudioLevelSFX"));
+                F32 volume = mAudioGain * gSavedSettings.getF32("AudioLevelSFX");
                 mAudioSourcep->setGain(volume);
         }
         return FALSE;
@@ -4331,7 +4331,7 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
         {
                 BOOL queue = flags & LL_SOUND_FLAG_QUEUE;
                 mAudioGain = gain;
-                F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : gain * gSavedSettings.getF32("AudioLevelSFX");
+                F32 volume = gain * gSavedSettings.getF32("AudioLevelSFX");
                 mAudioSourcep->setGain(volume);
                 mAudioSourcep->setLoop(flags & LL_SOUND_FLAG_LOOP);
                 mAudioSourcep->setSyncMaster(flags & LL_SOUND_FLAG_SYNC_MASTER);
@@ -4370,7 +4370,7 @@ void LLViewerObject::adjustAudioGain(const F32 gain)
         if (mAudioSourcep)
         {
                 mAudioGain = gain;
-                F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : mAudioGain * gSavedSettings.getF32("AudioLevelSFX");
+                F32 volume = mAudioGain * gSavedSettings.getF32("AudioLevelSFX");
                 mAudioSourcep->setGain(volume);
         }
 }
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index 956ed03..94f6d84 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -384,17 +384,11 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
 
 void callback_play_media(S32 option, void* data)
 {
-        LLParcel* parcel = (LLParcel*)data;
         if (option == 0)
         {
-                gSavedSettings.setBOOL("AudioStreamingVideo", TRUE);
+                LLParcel* parcel = (LLParcel*)data;
                 LLViewerParcelMedia::play(parcel);
         }
-        else
-        {
-                gSavedSettings.setBOOL("AudioStreamingVideo", FALSE);
-        }
         gSavedSettings.setWarning("FirstStreamingVideo", FALSE);
-
 }
 
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 5ef6f83..2dee2bf 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -1692,7 +1692,12 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 
 void optionally_start_music(const std::string& music_url)
 {
-        if (gSavedSettings.getBOOL("AudioStreamingMusic"))
+        // Check to see if this your first time on a music-enabled parcel.
+        if (gSavedSettings.getWarning("FirstStreamingMusic"))
+        {
+                gViewerWindow->alertXml("ParcelCanPlayMusic", callback_start_music, (void*)&music_url);
+        }
+        else if (gSavedSettings.getBOOL("AudioStreamingMusic"))
         {
                 // Make the user click the start button on the overlay bar. JC
                 //              llinfos << "Starting parcel music " << music_url << llendl;
@@ -1706,6 +1711,21 @@ void optionally_start_music(const std::string& music_url)
         }
 }
 
+
+void callback_start_music(S32 option, void* data)
+{
+        if (option == 0)
+        {
+                // Before the callback, we verified the url was good.
+                // We fetch again to avoid lag while loading.
+                LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();          
+                gAudiop->startInternetStream(parcel->getMusicURL());
+
+                LLOverlayBar::musicFirstRun();
+        }
+        gSavedSettings.setWarning("FirstStreamingMusic", FALSE);
+}
+
 // static
 void LLViewerParcelMgr::processParcelAccessListReply(LLMessageSystem *msg, void **user)
 {
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index d41f72e..fd2487b 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3797,7 +3797,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
         const LLUUID AGENT_FOOTSTEP_ANIMS[] = {ANIM_AGENT_WALK, ANIM_AGENT_RUN, ANIM_AGENT_LAND};
         const S32 NUM_AGENT_FOOTSTEP_ANIMS = sizeof(AGENT_FOOTSTEP_ANIMS) / sizeof(LLUUID);
 
-        if ( gAudiop && isAnyAnimationSignaled(AGENT_FOOTSTEP_ANIMS, NUM_AGENT_FOOTSTEP_ANIMS) )
+        if ( gAudiop && !gSavedSettings.getBOOL("MuteAmbient") && isAnyAnimationSignaled(AGENT_FOOTSTEP_ANIMS, NUM_AGENT_FOOTSTEP_ANIMS) )
         {
                 BOOL playSound = FALSE;
                 LLVector3 foot_pos_agent;
@@ -3828,7 +3828,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 //                                                      AUDIO_STEP_LO_SPEED, AUDIO_STEP_HI_SPEED,
 //                                                      AUDIO_STEP_LO_GAIN, AUDIO_STEP_HI_GAIN );
 
-                        const F32 STEP_VOLUME = 0.5f;
+                        const F32 STEP_VOLUME = 0.2f;
                         LLUUID& step_sound_id = getStepSound();
 
                         LLVector3d foot_pos_global = gAgent.getPosGlobalFromAgent(foot_pos_agent);
@@ -4800,7 +4800,7 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
         {
                 if (anim_id == ANIM_AGENT_TYPE)
                 {
-                        if (gAudiop)
+                        if (gAudiop && !gSavedSettings.getBOOL("MuteAmbient"))
                         {
                                 LLVector3d char_pos_global = gAgent.getPosGlobalFromAgent(getCharacterPosition());
                                 if (LLViewerParcelMgr::getInstance()->canHearSound(char_pos_global)
@@ -4814,11 +4814,8 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
                                         //      gAudiop->triggerSound(LLUUID(gSavedSettings.getString("UISndTyping")), volume);
                                         //}
                                         //else
-                                        {
-                                                LLUUID sound_id = LLUUID(gSavedSettings.getString("UISndTyping"));
-                                                gAudiop->triggerSound(sound_id, getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_SFX, char_pos_global);
-
-                                        }
+                                        LLUUID sound_id = LLUUID(gSavedSettings.getString("UISndTyping"));
+                                        gAudiop->triggerSound(sound_id, getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_SFX, char_pos_global);
                                 }
                         }
                 }
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/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
index d16c22c..a3e2bba 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
@@ -6,9 +6,9 @@
         <menu_item_call enabled="true" label="Groups..." name="Groups...">
                 <on_click function="ShowAgentGroups" userdata="agent" />
         </menu_item_call>
-        <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
+        <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Attachment Touch">
                         <on_click function="Object.Touch" />
-                        <on_enable function="Object.EnableTouch" userdata="Touch" />
+                        <on_enable function="Attachment.EnableTouch" userdata="Touch" />
                 </menu_item_call>
         <menu_item_call enabled="true" label="Stand Up" name="Stand Up">
                 <on_click function="Self.StandUp" userdata="" />
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 1fead04..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
@@ -1,98 +1,90 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel bg_visible="false" border="false" border_visible="false" bottom="1"

-     enabled="true" follows="right|bottom" height="20" left="0"

-     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"

-             width="20" />

-        <button bottom="-21" enabled="true" follows="left|top" height="20"

-          image_overlay="icn_play.tga"

-          image_unselected="flyout_btn_left.tga"

-             image_selected="flyout_btn_left_selected.tga"

-             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" />

-  <button bottom="-21" enabled="true" follows="left|top" height="20"

-             image_overlay="icn_stop.tga"

-             image_unselected="flyout_btn_right.tga"

-             image_selected="flyout_btn_right_selected.tga"

-             image_disabled="flyout_btn_right_disabled.tga"

-             label="" left_delta="20"

-             mouse_opaque="true" name="music_stop" scale_image="true" toggle="false"

-             tool_tip="Stop streaming music" width="20" />

-  <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"

-             width="20" />

-  <button bottom="-21" enabled="true" follows="left|top" height="20"

-             image_overlay="icn_play.tga"

-             image_unselected="flyout_btn_left.tga"

-             image_selected="flyout_btn_left_selected.tga"

-             image_disabled="flyout_btn_left_disabled.tga"

-             label="" left_delta="21"

-             mouse_opaque="true" name="media_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="media_pause" scale_image="true" toggle="false"

-             tool_tip="Pause streaming media" width="20" />

-        <button bottom="-21" enabled="true" follows="left|top" height="20"

-             image_overlay="icn_stop.tga"

-                          image_unselected="flyout_btn_right.tga"

-             image_selected="flyout_btn_right_selected.tga"

-             image_disabled="flyout_btn_right_disabled.tga"

-             label="" left_delta="20"

-             mouse_opaque="true" name="media_stop" scale_image="true" toggle="false"

-             tool_tip="Stop streaming media" width="20" />

-        <volume_slider bottom="-23" control_name="AudioLevelMaster" height="22" increment="0.05"

-             initial_val="0.5" left_delta="15" max_val="1" min_val="0"

-             mouse_opaque="true" name="volume_slider" tool_tip="Master Volume"

-             width="56" />

-        <button bottom="-19" control_name="MuteAudio" height="20"

-             image_selected="icn_speaker-muted_dark.tga"

-             image_unselected="icn_speaker_dark.tga" label="" left_delta="56"

-             name="mute_master" toggle="true" tool_tip="Master Mute" width="24" />

-        <button bottom="-22" control_name="ShowVolumeSettingsPopup" height="22" label=""

-             left_delta="19" name="expand" scale_image="true" toggle="true"

-             tool_tip="Adjust individual volume levels" width="22" />

-        

-        <string name="play_label">

-                Play

-        </string>

-        <string name="stop_label">

-                Stop

-        </string>

-        <string name="pause_label">

-                Pause

-        </string>

-        <string name="default_tooltip_label">

-                No Media Specified

-        </string>

-        <string name="media_hidden_label">

-                (URL hidden by parcel owner)

-        </string>

-        <string name="media_icon_tooltip_web">

-                This location displays content from the World Wide Web. Click the Play button to display Web content.

-        </string>

-        <string name="media_icon_tooltip_movie">

-                This location displays Video content. Click the Play button to play the video.

-        </string>

-        <string name="media_play_tooltip">

-                Display Web content at this location.

-        </string>

-</panel>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+     enabled="true" follows="right|bottom" height="20" left="0"
+     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 streaming music"
+             width="20" />
+        <button bottom="-21" enabled="true" follows="left|top" height="20"
+          image_overlay="icn_play.tga"
+          image_unselected="flyout_btn_left.tga"
+             image_selected="flyout_btn_left_selected.tga"
+             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 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"
+             image_selected="flyout_btn_right_selected.tga"
+             image_disabled="flyout_btn_right_disabled.tga"
+             label="" left_delta="20"
+             mouse_opaque="true" name="music_stop" scale_image="true" toggle="false"
+             tool_tip="Stop streaming music" width="20" />
+  <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 media"
+             width="20" />
+  <button bottom="-21" enabled="true" follows="left|top" height="20"
+             image_overlay="icn_play.tga"
+             image_unselected="flyout_btn_left.tga"
+             image_selected="flyout_btn_left_selected.tga"
+             image_disabled="flyout_btn_left_disabled.tga"
+             label="" left_delta="21"
+             mouse_opaque="true" name="media_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="media_pause" scale_image="true" toggle="false"
+             tool_tip="Pause streaming media" width="20" />
+        <button bottom="-21" enabled="true" follows="left|top" height="20"
+             image_overlay="icn_stop.tga"
+                          image_unselected="flyout_btn_right.tga"
+             image_selected="flyout_btn_right_selected.tga"
+             image_disabled="flyout_btn_right_disabled.tga"
+             label="" left_delta="20"
+             mouse_opaque="true" name="media_stop" scale_image="true" toggle="false"
+             tool_tip="Stop streaming media" width="20" />
+        <volume_slider bottom="-23" control_name="AudioLevelMaster" height="22" increment="0.05"
+             initial_val="0.5" left_delta="15" max_val="1" min_val="0"
+             mouse_opaque="true" name="volume_slider" tool_tip="Master Volume"
+             width="56" />
+        <button bottom="-19" control_name="MuteAudio" height="20"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
+             name="mute_master" toggle="true" tool_tip="Master Mute" width="24" />
+        <button bottom="-22" control_name="ShowVolumeSettingsPopup" height="22" label=""
+             left_delta="19" name="expand" scale_image="true" toggle="true"
+             tool_tip="Adjust individual volume levels" width="22" />
+        
+        <string name="play_label">
+                Play
+        </string>
+        <string name="stop_label">
+                Stop
+        </string>
+        <string name="pause_label">
+                Pause
+        </string>
+        <string name="default_tooltip_label">
+                No Media Specified
+        </string>
+        <string name="media_hidden_label">
+                (URL hidden by parcel owner)
+        </string>
+        <string name="media_icon_tooltip_web">
+                This location displays content from the World Wide Web. Click the Play button to display Web content.
+        </string>
+        <string name="media_icon_tooltip_movie">
+                This location displays Video content. Click the Play button to play the video.
+        </string>
+        <string name="media_play_tooltip">
+                Display Web content at this location.
+        </string>
+</panel>