diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-10 15:26:04 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-10 15:26:04 +0200 |
| commit | 2d1c1cbf3afed9b7a54de86f61a1a2d2ac3beba1 (patch) | |
| tree | 97275b832beb3a0bc149a0728cb9e244e5a2f956 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | efee637e3bf1a13591d83e6cbf52acc483a6e61a (diff) | |
| parent | 5831cb1394338cdfc45e3188a034edb54c2b785f (diff) | |
Merge
--HG--
branch : product-engine
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; } |