diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-08 13:33:21 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-08 13:33:21 -0500 |
| commit | 37848d29d9030e00086c3a499d28237cdf943e1b (patch) | |
| tree | d4af1d371cf94a1970f9449b1adc8ba29e86bb9d /indra/newview/llchathistory.cpp | |
| parent | 51a196416d9bde106ae0cb3cfd77003a68a6265b (diff) | |
| parent | e07ef0d0e0e8cbd58afd4c6ee970634bd2f783e7 (diff) | |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 4 |
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")); + } } |