diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 14:15:02 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 14:15:02 +0000 |
| commit | 8a8304eeac03a45c27f9b83cbff8c3304d536172 (patch) | |
| tree | 97275b832beb3a0bc149a0728cb9e244e5a2f956 /indra/newview/llchathistory.cpp | |
| parent | 30f74e81dc9dc8660b8b5ceb41469373c5c92e64 (diff) | |
| parent | 2d1c1cbf3afed9b7a54de86f61a1a2d2ac3beba1 (diff) | |
PE merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index c125f84c58..13a5df353d 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -289,7 +289,12 @@ public: if(!chat.mFromID.isNull()) { - icon->setValue(chat.mFromID); + if(mSourceType != CHAT_SOURCE_AGENT) + icon->setValue(LLSD("OBJECT_Icon")); + else + icon->setValue(chat.mFromID); + + } else if (userName->getValue().asString()==LLTrans::getString("SECOND_LIFE")) { |