diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-29 16:24:58 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-29 16:24:58 -0700 |
| commit | 86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (patch) | |
| tree | 35ab8edbc364a05a5d29d343f63b22e01ea5cb38 /indra/newview/llinspectavatar.cpp | |
| parent | 3fca923949667d1c713119043cd4aaeae4acfe09 (diff) | |
| parent | 8654ba5e2571e07c8d2fd898027abf6f85777905 (diff) | |
Automated merge
Diffstat (limited to 'indra/newview/llinspectavatar.cpp')
| -rw-r--r-- | indra/newview/llinspectavatar.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 5227254930..dfc69db3f1 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -563,8 +563,8 @@ void LLInspectAvatar::updateVolumeSlider() LLUICtrl* volume_slider = getChild<LLUICtrl>("volume_slider"); volume_slider->setEnabled( !is_muted ); - const F32 DEFAULT_VOLUME = 0.5f; F32 volume; + if (is_muted) { // it's clearer to display their volume as zero @@ -574,13 +574,6 @@ void LLInspectAvatar::updateVolumeSlider() { // actual volume volume = LLVoiceClient::getInstance()->getUserVolume(mAvatarID); - - // *HACK: Voice client doesn't have any data until user actually - // says something. - if (volume == 0.f) - { - volume = DEFAULT_VOLUME; - } } volume_slider->setValue( (F64)volume ); } |