diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-03-24 09:17:08 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-03-24 09:17:08 +0200 |
| commit | 07de4edbc45de93c04bc4d0a7c174a45c902b50f (patch) | |
| tree | 14d90da452bb109e6f94567f057fac5f41ef0cf0 /indra/newview/llinspectavatar.cpp | |
| parent | 2edbd733843d5ad0f9ec3dec49e676651bda07af (diff) | |
| parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinspectavatar.cpp')
| -rw-r--r-- | indra/newview/llinspectavatar.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 14bc4376fe..35cb9b3468 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -564,7 +564,6 @@ 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) { @@ -575,13 +574,6 @@ void LLInspectAvatar::updateVolumeSlider() { // actual volume volume = gVoiceClient->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 ); } |