diff options
Diffstat (limited to 'indra/newview/lloverlaybar.cpp')
| -rw-r--r-- | indra/newview/lloverlaybar.cpp | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp index 8af83af272..53066aa52d 100644 --- a/indra/newview/lloverlaybar.cpp +++ b/indra/newview/lloverlaybar.cpp @@ -160,11 +160,10 @@ void LLOverlayBar::layoutButtons() { LLView* state_buttons_panel = getChildByName("state_buttons", TRUE); - if (state_buttons_panel) + if (state_buttons_panel && state_buttons_panel->getVisible()) { LLViewQuery query; LLWidgetTypeFilter widget_filter(WIDGET_TYPE_BUTTON); - query.addPreFilter(LLVisibleFilter::getInstance()); query.addPreFilter(LLEnabledFilter::getInstance()); query.addPreFilter(&widget_filter); @@ -333,7 +332,7 @@ void LLOverlayBar::onClickStandUp(void*) // *TODO: Move this into an audio manager abstraction //static -void LLOverlayBar::mediaPlay(void*) +void LLOverlayBar::toggleMediaPlay(void*) { if (!gOverlayBar) { @@ -360,24 +359,7 @@ void LLOverlayBar::mediaPlay(void*) } //static -void LLOverlayBar::mediaPause(void*) -{ - - LLViewerParcelMedia::pause(); -} - -//static -void LLOverlayBar::mediaStop(void*) -{ - if (!gOverlayBar) - { - return; - } - LLViewerParcelMedia::stop(); -} - -//static -void LLOverlayBar::musicPlay(void*) +void LLOverlayBar::toggleMusicPlay(void*) { if (!gOverlayBar) { |