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

EXT-3429: Don't display inspect slider when inappropriate. 

The avatar inspector has a volume slider and mute button. We make
these widgets invisible when it does not makes sense to interact with
them. That is, when the inspector is for your own avatar, or when
voice is not active.
meow-7.2.2
Lynx Linden 2010-01-11 16:59:28 +00:00
parent 92b569a607
commit a2c08d8e86
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llinspectavatar.cpp
View File

@ -278,7 +278,7 @@ void LLInspectAvatar::onOpen(const LLSD& data)
getChild<LLUICtrl>("gear_self_btn")->setVisible(self);
getChild<LLUICtrl>("gear_btn")->setVisible(!self);
// Position the inspector relative to the mouse cursor
// Similar to how tooltips are positioned
// See LLToolTipMgr::createToolTip
@ -518,13 +518,17 @@ void LLInspectAvatar::updateVolumeSlider()
bool is_muted = LLMuteList::getInstance()->
isMuted(mAvatarID, LLMute::flagVoiceChat);
bool voice_enabled = gVoiceClient->getVoiceEnabled(mAvatarID);
bool is_self = (mAvatarID == gAgent.getID());
LLUICtrl* mute_btn = getChild<LLUICtrl>("mute_btn");
mute_btn->setEnabled( voice_enabled );
mute_btn->setValue( is_muted );
mute_btn->setVisible( voice_enabled && !is_self );
LLUICtrl* volume_slider = getChild<LLUICtrl>("volume_slider");
volume_slider->setEnabled( voice_enabled && !is_muted );
volume_slider->setVisible( voice_enabled && !is_self );
const F32 DEFAULT_VOLUME = 0.5f;
F32 volume;
if (is_muted)