diff options
author | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
commit | 2f6166a5a4f8d5be679cef0699142c4ef061fb55 (patch) | |
tree | f45efe7e4c55c37dc097f15f8e0f445d86bfe972 /indra/newview/llchathistory.cpp | |
parent | 8729f5d23a52263e55df5574c672c87d00b563bd (diff) | |
parent | a16a6034c25c5e78331ef1bd13485df8759456e5 (diff) |
Pulled merge from llinternal/bento-box.
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rwxr-xr-x | 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 b81b95462e..dc0835eb1c 100755 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -376,6 +376,10 @@ public: || mSourceType == CHAT_SOURCE_SYSTEM) { mFrom = LLTrans::getString("SECOND_LIFE"); + if(!chat.mFromName.empty() && (mFrom != chat.mFromName)) + { + mFrom += " (" + chat.mFromName + ")"; + } user_name->setValue(mFrom); updateMinUserNameWidth(); } |