diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 15:58:56 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 15:58:56 -0700 |
| commit | ac17ec0c287246dbb00d21a6b4994949eac69737 (patch) | |
| tree | 3da999db2b63dbaa74a8c7ce2572e3f17df454dd /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | 77f795cae59f7fa52d57ba30469cb0ddb744ac4d (diff) | |
| parent | 61cb3d31137f30f3766dbe3c22d700fbdf517d80 (diff) | |
Merge pull from dessie/viewer-public
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
| -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; } |