diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-27 19:26:41 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-27 19:26:41 +0200 |
| commit | 26b7e6178961016bcd6437cd473b0eb5650b4de1 (patch) | |
| tree | 80682f65ae12fbb731ed5fc7c52ac3d8c8978e95 | |
| parent | 68ccc70e6579547d7b42134f79267a9fd40be35f (diff) | |
fix for normal bug: EXT-1713 Nearby Chat: Objects have tooltips (???)(???)
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llavatariconctrl.h | 2 | ||||
| -rw-r--r-- | 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 426fcec514..65b5c86ed5 100644 --- a/indra/newview/llavatariconctrl.h +++ b/indra/newview/llavatariconctrl.h @@ -103,6 +103,8 @@ public: 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 f6cf61a13a..512773d215 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -159,6 +159,7 @@ public: mSourceType = CHAT_SOURCE_SYSTEM; } + LLTextBox* userName = getChild<LLTextBox>("user_name"); if(!chat.mFromName.empty()) @@ -174,18 +175,14 @@ public: 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) |