summaryrefslogtreecommitdiff
path: root/indra/newview/llchatitemscontainerctrl.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-18 10:58:18 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-18 10:58:18 +0100
commitcd0ab5b41eda85b9cb4855f61c3f7e4ca5150797 (patch)
tree6e580ae150bc6942b393ad4bb73213c9f81fe909 /indra/newview/llchatitemscontainerctrl.cpp
parent8b7563660c1d2ee7463edd24116a327b3b6553c3 (diff)
parentb6ed10e8285e4abef4f14c618186984ef4b2cf7f (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
-rw-r--r--indra/newview/llchatitemscontainerctrl.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 5b6a99e793..35a244c461 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -326,12 +326,14 @@ void LLNearbyChatToastPanel::draw()
if(icon)
{
icon->setDrawTooltip(mSourceType == CHAT_SOURCE_AGENT);
- if(mSourceType == CHAT_SOURCE_AGENT)
- icon->setValue(mFromID);
+ if(mSourceType == CHAT_SOURCE_OBJECT)
+ icon->setValue(LLSD("OBJECT_Icon"));
else if(mSourceType == CHAT_SOURCE_SYSTEM)
icon->setValue(LLSD("SL_Logo"));
- else
- icon->setValue(LLSD("OBJECT_Icon"));
+ else if(mSourceType == CHAT_SOURCE_AGENT)
+ icon->setValue(mFromID);
+ else if(!mFromID.isNull())
+ icon->setValue(mFromID);
}
mIsDirty = false;
}