summaryrefslogtreecommitdiff
path: root/indra/newview/llinspectavatar.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-24 10:32:38 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-24 10:32:38 +0000
commit7857f59f9e7c673f1ddbf32d6a66e85f78004445 (patch)
treef9831059bcadfc8be4fc5cd09673dfa419fa9b63 /indra/newview/llinspectavatar.cpp
parente7d9999359dd62509c685181d620b092ed28bc60 (diff)
parent00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff)
merge from viewer-2-0
Diffstat (limited to 'indra/newview/llinspectavatar.cpp')
-rw-r--r--indra/newview/llinspectavatar.cpp8
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 );
}