diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-17 18:39:11 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-17 18:39:11 +0300 |
| commit | fcea61df76ce69b438d26037df4bafc3380f129d (patch) | |
| tree | bcafef21100cb34a282599f7f6a21444afe45746 | |
| parent | 4683283a666e3c34b6df52951b96c342a44679a8 (diff) | |
EXT-7266 FIX change default icon id tofrom object icon to id that comes with message
Reviwed by Igor Borovkov at https://codereview.productengine.com/secondlife/r/371/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 10 |
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; } |