diff options
| author | James Cook <james@lindenlab.com> | 2010-01-11 14:18:43 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-01-11 14:18:43 -0800 |
| commit | fb9a20802f3386bee82a8bd9a479f209374fa9a4 (patch) | |
| tree | 0da331f9a196ef4de611659244209f3a076459c1 | |
| parent | a36087f5c1851b0bd5eec5788609f35b8a524384 (diff) | |
Better resolution of merge conflict
| -rw-r--r-- | indra/newview/llinspectavatar.cpp | 3 |
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; |