diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-23 23:02:02 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-23 23:02:02 -0400 |
| commit | 62ebb4533ceff1d0a7cf68a6385a8d3b34fa51d4 (patch) | |
| tree | dd6cd1b313f933847c6e603d50a65ffbc82fee01 /indra/newview/llinspectavatar.cpp | |
| parent | 3ad56f22158dd2665204745af2171689f208cd7e (diff) | |
| parent | ea8f1b80df0fcfcdbb52123b2ece68916ed139ff (diff) | |
Merge from viewer-2-0
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 ); } |