1 files changed, 8 insertions, 12 deletions

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);