From 37076c285bceb4546bd3e7b6fa1b175008508368 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 9 Mar 2011 22:45:57 -0700 Subject: Fixed play button disappearing when you play streaming audio --- linden/indra/newview/llmediaremotectrl.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp index 27a686d..8186293 100644 --- a/linden/indra/newview/llmediaremotectrl.cpp +++ b/linden/indra/newview/llmediaremotectrl.cpp @@ -153,7 +153,7 @@ void LLMediaRemoteCtrl::enableMediaButtons() bool stop_media_enabled = false; bool play_music_enabled = false; bool stop_music_enabled = false; - bool music_show_pause = false; + //bool music_show_pause = false; bool media_show_pause = false; static LLColor4* sIconDisabledColor = rebind_llcontrol("IconDisabledColor", &gColors, true); @@ -213,12 +213,12 @@ void LLMediaRemoteCtrl::enableMediaButtons() 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; } } @@ -227,7 +227,7 @@ void LLMediaRemoteCtrl::enableMediaButtons() const std::string media_icon_name = LLMIMETypes::findIcon(media_type); LLButton* music_play_btn = getChild("music_play"); LLButton* music_stop_btn = getChild("music_stop"); - LLButton* music_pause_btn = getChild("music_pause"); + //LLButton* music_pause_btn = getChild("music_pause"); LLButton* media_play_btn = getChild("media_play"); LLButton* media_stop_btn = getChild("media_stop"); LLButton* media_pause_btn = getChild("media_pause"); @@ -235,9 +235,9 @@ void LLMediaRemoteCtrl::enableMediaButtons() 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); + //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()) { -- cgit v1.1