diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-01-11 16:59:28 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-01-11 16:59:28 +0000 |
| commit | a2c08d8e86a46fe37006a8086c56866445e57bf3 (patch) | |
| tree | d103253290dd07f8bb3b51e00cc547c7e0163766 | |
| parent | 92b569a6079f55009dd9c291e9d7c56a00baf247 (diff) | |
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.
| -rw-r--r-- | indra/newview/llinspectavatar.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 72994a4371..a2b3a54f51 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -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) |