livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better resolution of merge conflict

meow-7.2.2
James Cook 2010-01-11 14:18:43 -08:00
parent a36087f5c1
commit fb9a20802f
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llinspectavatar.cpp
View File

@ -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;