Skip to content
Snippets Groups Projects
Commit 26b7e617 authored by Yuri Chebotarev's avatar Yuri Chebotarev
Browse files

fix for normal bug: EXT-1713 Nearby Chat: Objects have tooltips (???)(???)

--HG--
branch : product-engine
parent 68ccc70e
No related branches found
No related tags found
No related merge requests found
...@@ -103,6 +103,8 @@ class LLAvatarIconCtrl ...@@ -103,6 +103,8 @@ class LLAvatarIconCtrl
const std::string& getFirstName() const { return mFirstName; } const std::string& getFirstName() const { return mFirstName; }
const std::string& getLastName() const { return mLastName; } const std::string& getLastName() const { return mLastName; }
void setDrawTooltip(bool value) { mDrawTooltip = value;}
protected: protected:
LLUUID mAvatarId; LLUUID mAvatarId;
std::string mFirstName; std::string mFirstName;
......
...@@ -159,6 +159,7 @@ class LLChatHistoryHeader: public LLPanel ...@@ -159,6 +159,7 @@ class LLChatHistoryHeader: public LLPanel
mSourceType = CHAT_SOURCE_SYSTEM; mSourceType = CHAT_SOURCE_SYSTEM;
} }
LLTextBox* userName = getChild<LLTextBox>("user_name"); LLTextBox* userName = getChild<LLTextBox>("user_name");
if(!chat.mFromName.empty()) if(!chat.mFromName.empty())
...@@ -174,18 +175,14 @@ class LLChatHistoryHeader: public LLPanel ...@@ -174,18 +175,14 @@ class LLChatHistoryHeader: public LLPanel
LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon"); LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon");
if(mSourceType != CHAT_SOURCE_AGENT)
icon->setDrawTooltip(false);
if(!chat.mFromID.isNull()) if(!chat.mFromID.isNull())
{ {
icon->setValue(chat.mFromID); 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) void nameUpdatedCallback(const LLUUID& id,const std::string& first,const std::string& last,BOOL is_group)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment