diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 14:51:39 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 14:51:39 +0000 |
| commit | 56d43b9c79ede83c563c4d6d1f60ea831926e1ac (patch) | |
| tree | 9ae0595dfdbbd4ff22a93f2e48ad49e1060ca802 /indra/newview/llchathistory.cpp | |
| parent | a4ef5e2b0d4e36aa98f2e4074f4ddd4cad3d3106 (diff) | |
| parent | 15825cb8992ce692172907714c7cd64a48ed5fa4 (diff) | |
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 929457046c..13a5df353d 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -116,7 +116,7 @@ public: //*TODO remake it using mouse enter/leave and static LLHandle<LLIconCtrl> to add/remove as a child BOOL handleToolTip(S32 x, S32 y, MASK mask) { - LLViewerTextEditor* name = getChild<LLViewerTextEditor>("user_name"); + LLTextBase* name = getChild<LLTextBase>("user_name"); if (name && name->parentPointInView(x, y) && mAvatarID.notNull() && SYSTEM_FROM != mFrom) { @@ -289,7 +289,12 @@ public: if(!chat.mFromID.isNull()) { - icon->setValue(chat.mFromID); + if(mSourceType != CHAT_SOURCE_AGENT) + icon->setValue(LLSD("OBJECT_Icon")); + else + icon->setValue(chat.mFromID); + + } else if (userName->getValue().asString()==LLTrans::getString("SECOND_LIFE")) { |