From ba057d34cdc8fb91093aadaaad22618b6371cd0f Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Fri, 16 Apr 2010 14:48:06 -0700 Subject: Fixed prim controls mute bug Reviewed by Richard CC#204 --- indra/newview/llpanelprimmediacontrols.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra') diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index e8c1a0a569..5209d50755 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -463,10 +463,21 @@ void LLPanelPrimMediaControls::updateShape() mSkipBackCtrl->setEnabled(FALSE); #ifdef PER_MEDIA_VOLUME + // these should be pulled up above the pluginSupportsMediaTime + // if check once we always have PER_MEDIA_VOLUME turned on mVolumeCtrl->setVisible(has_focus); mVolumeCtrl->setEnabled(has_focus); mVolumeSliderCtrl->setEnabled(has_focus && shouldVolumeSliderBeVisible()); mVolumeSliderCtrl->setVisible(has_focus && shouldVolumeSliderBeVisible()); + + if(media_impl->getVolume() <= 0.0) + { + mMuteBtn->setToggleState(true); + } + else + { + mMuteBtn->setToggleState(false); + } #else mVolumeCtrl->setVisible(FALSE); mVolumeSliderCtrl->setVisible(FALSE); -- cgit v1.2.3