From b0b796cb05b2313b3c8c642838b68e7d9a0d84a6 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Thu, 17 Dec 2009 18:50:59 +0200 Subject: =?UTF-8?q?implemented=20EXT-3512=20=E2=80=9CAdd=20tool-tip=20to?= =?UTF-8?q?=20avatar=20name=E2=80=9D;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llpanelimcontrolpanel.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra') diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 4f76d32ad5..70e4798079 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -194,6 +194,7 @@ void LLPanelIMControlPanel::setSessionId(const LLUUID& session_id) childSetEnabled("pay_btn", FALSE); getChild("avatar_name")->setValue(im_session->mName); + getChild("avatar_name")->setToolTip(im_session->mName); } else { @@ -217,6 +218,7 @@ void LLPanelIMControlPanel::nameUpdatedCallback(const LLUUID& id, const std::str avatar_name.append(" "); avatar_name.append(last); getChild("avatar_name")->setValue(avatar_name); + getChild("avatar_name")->setToolTip(avatar_name); } } -- cgit v1.2.3 From 08c5a509d38951023fd6c201c340883792a35a5f Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Thu, 17 Dec 2009 19:06:21 +0200 Subject: Fixed normal bug EXT-3542 (Avatar blocked "by text" looks confusing) -- implemented reaction of Speaker indicator only on voice blocking --HG-- branch : product-engine --- indra/newview/lloutputmonitorctrl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp index 39381e3faa..fa16cb6473 100644 --- a/indra/newview/lloutputmonitorctrl.cpp +++ b/indra/newview/lloutputmonitorctrl.cpp @@ -243,7 +243,8 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id) } else { - setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId)); + // check only blocking on voice. EXT-3542 + setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId, LLMute::flagVoiceChat)); LLMuteList::getInstance()->addObserver(this); } } @@ -251,5 +252,6 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id) void LLOutputMonitorCtrl::onChange() { - setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId)); + // check only blocking on voice. EXT-3542 + setIsMuted(LLMuteList::getInstance()->isMuted(mSpeakerId, LLMute::flagVoiceChat)); } -- cgit v1.2.3