diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-09-17 10:50:08 -0700 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-09-17 10:50:08 -0700 |
| commit | e5aeaa659a453674ef898cdd2ad6183d5eb77e41 (patch) | |
| tree | 2c7196f2f80d11b6f6d660c5852299646f2d449a /indra/newview/llpanelnearbymedia.cpp | |
| parent | 7318bd61f7a7ea89e471a6e0f3cc310786a3b41c (diff) | |
| parent | 6f54add8a8852c8f3df86abebe38ef0ce4a6742c (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelnearbymedia.cpp')
| -rw-r--r-- | indra/newview/llpanelnearbymedia.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index d8ef5b39ad..f3a2ed9408 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -1168,12 +1168,12 @@ void LLPanelNearByMedia::onClickSelectedMediaMute() F32 volume = impl->getVolume(); if(volume > 0.0) { - impl->setVolume(0.0); + impl->setMute(true); } else if (mVolumeSlider->getValueF32() == 0.0) { - impl->setVolume(1.0); - mVolumeSlider->setValue(1.0); + impl->setMute(false); + mVolumeSlider->setValue(impl->getVolume()); } else { |