From 26b7e6178961016bcd6437cd473b0eb5650b4de1 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Tue, 27 Oct 2009 19:26:41 +0200
Subject: [PATCH] fix for normal bug: EXT-1713 Nearby Chat: Objects have
tooltips (???)(???)
--HG--
branch : product-engine
---
indra/newview/llavatariconctrl.h | 2 ++
indra/newview/llchathistory.cpp | 9 +++------
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llavatariconctrl.h b/indra/newview/llavatariconctrl.h
index 426fcec5141..65b5c86ed54 100644
--- a/indra/newview/llavatariconctrl.h
+++ b/indra/newview/llavatariconctrl.h
@@ -103,6 +103,8 @@ class LLAvatarIconCtrl
const std::string& getFirstName() const { return mFirstName; }
const std::string& getLastName() const { return mLastName; }
+ void setDrawTooltip(bool value) { mDrawTooltip = value;}
+
protected:
LLUUID mAvatarId;
std::string mFirstName;
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index f6cf61a13a3..512773d215d 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -159,6 +159,7 @@ class LLChatHistoryHeader: public LLPanel
mSourceType = CHAT_SOURCE_SYSTEM;
}
+
LLTextBox* userName = getChild<LLTextBox>("user_name");
if(!chat.mFromName.empty())
@@ -174,18 +175,14 @@ class LLChatHistoryHeader: public LLPanel
LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon");
+ if(mSourceType != CHAT_SOURCE_AGENT)
+ icon->setDrawTooltip(false);
if(!chat.mFromID.isNull())
{
icon->setValue(chat.mFromID);
}
- else
- {
- }
-
- if(mSourceType != CHAT_SOURCE_AGENT)
- icon->setToolTip(std::string(""));
}
void nameUpdatedCallback(const LLUUID& id,const std::string& first,const std::string& last,BOOL is_group)
--
GitLab