summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-12-07 17:09:19 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-12-07 17:09:19 -0800
commit5c2686bc6323cb162d9b3e4effa6a8d34fb95836 (patch)
tree8162047cfafa9027dbcdc03597f8a0a2ad92c9ee /indra/newview/llchathistory.cpp
parentb65334a4c133984fed9466db60df92756e8de05d (diff)
parent5245fb69721bf4b70de85211da6721b0e0137e07 (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"));
+ }
}