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/llchatitemscontainerctrl.cpp | |
| parent | a4ef5e2b0d4e36aa98f2e4074f4ddd4cad3d3106 (diff) | |
| parent | 15825cb8992ce692172907714c7cd64a48ed5fa4 (diff) | |
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index f772aea4bd..e164aa8fc4 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -321,7 +321,10 @@ void LLNearbyChatToastPanel::draw() if(icon) { icon->setDrawTooltip(mSourceType == CHAT_SOURCE_AGENT); - icon->setValue(mFromID); + if(mSourceType == CHAT_SOURCE_AGENT) + icon->setValue(mFromID); + else + icon->setValue(LLSD("OBJECT_Icon")); } mIsDirty = false; } |