diff options
| author | James Cook <james@lindenlab.com> | 2010-02-11 10:09:23 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-11 10:09:23 -0800 |
| commit | 9dd7924b19651abf393f7b0dee632904a6b8e52a (patch) | |
| tree | b22f8ca3ecdf4ec8e5288102912dccdd7289f51f /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | 301f250c1cd77711c0234d8ed4089453712f834e (diff) | |
| parent | 39fe664b97b946daf7984b946fede6f04ae731c4 (diff) | |
Merge
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; } |