summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorbea@american.lindenlab.com <bea@american.lindenlab.com>2009-12-09 12:53:35 -0800
committerbea@american.lindenlab.com <bea@american.lindenlab.com>2009-12-09 12:53:35 -0800
commit874f53230dbe40e599e8903fae87a60816508fd6 (patch)
tree6affd304d74261bd45f13eff4c1521b580ae8bc1 /indra/newview/llchathistory.cpp
parent0bf7917ae848388a3e1bc6ad13e300880fed12d0 (diff)
parent431bfca2ade364dc1165e402537e5e2d3616ebfd (diff)
merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 96b5ae5908..efe9ea4c35 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -211,6 +211,10 @@ public:
{
icon->setValue(chat.mFromID);
}
+ else if (userName->getValue().asString()==LLTrans::getString("SECOND_LIFE"))
+ {
+ icon->setValue(LLSD("SL_Logo"));
+ }
}