diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-16 14:48:06 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-16 14:48:06 -0700 |
commit | ba057d34cdc8fb91093aadaaad22618b6371cd0f (patch) | |
tree | a666c7d7419e603bf85c8cd628f51be19b35e873 /indra | |
parent | 652d18e6c4e33fbbe6343e8810d2c6accbc4f150 (diff) |
Fixed prim controls mute bug
Reviewed by Richard CC#204
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
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); |