summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-01-11 17:33:00 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-01-11 17:33:00 -0500
commit2a65ae22493956c6f21897f03897758f02acbb84 (patch)
tree00e8e4037677653283744bea5861b85d4e1364bd /indra
parent377ed9354323bf26389fa99dca8f2f5142763a36 (diff)
parentfb9a20802f3386bee82a8bd9a479f209374fa9a4 (diff)
merge
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llinspectavatar.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index 22451998c6..8f4fba244d 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -534,7 +534,6 @@ void LLInspectAvatar::updateVolumeSlider()
// By convention, we only display and toggle voice mutes, not all mutes
bool is_muted = LLMuteList::getInstance()->
isMuted(mAvatarID, LLMute::flagVoiceChat);
- bool is_self = (mAvatarID == gAgent.getID());
LLUICtrl* mute_btn = getChild<LLUICtrl>("mute_btn");
@@ -542,11 +541,9 @@ void LLInspectAvatar::updateVolumeSlider()
mute_btn->setEnabled( !is_linden);
mute_btn->setValue( is_muted );
- mute_btn->setVisible( voice_enabled && !is_self );
LLUICtrl* volume_slider = getChild<LLUICtrl>("volume_slider");
volume_slider->setEnabled( !is_muted );
- volume_slider->setVisible( voice_enabled && !is_self );
const F32 DEFAULT_VOLUME = 0.5f;
F32 volume;