summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-10 14:35:29 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-10 14:35:29 +0200
commit3eeb4e6599a87595d13b500074a22d88a1509983 (patch)
treebdf06cdc789bc43d40319599132c71dc11afc605 /indra/newview/llchathistory.cpp
parent8288530c45616a37dc7eef0b517b4383d3404ea6 (diff)
partitial fix for normal task EXT-2957 [BSI] Implement object icon for chat from objects, instead of using generic image for missing profile picture
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp7
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"))
{