diff options
| author | Bjoseph Wombat <bjoseph@vivox.com> | 2015-05-11 14:57:57 +0100 |
|---|---|---|
| committer | Bjoseph Wombat <bjoseph@vivox.com> | 2015-05-11 14:57:57 +0100 |
| commit | c6650c13306b0d049ecba02710645b9ca2d90c05 (patch) | |
| tree | 54932d9221df41ec9c608b70eeb5379fcb1d72c3 /indra/newview/llchathistory.cpp | |
| parent | 7ec58ee04789a8cc819d1151529d843045651bc8 (diff) | |
| parent | e611e35e033e99f619b0e4938f6879c8e387efd5 (diff) | |
updates from bitbucket repository
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rwxr-xr-x | indra/newview/llchathistory.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 84b9ac756a..f0bd63ba46 100755 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -1113,7 +1113,15 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL if (irc_me && !use_plain_text_chat_history) { - message = chat.mFromName + message; + std::string from_name = chat.mFromName; + LLAvatarName av_name; + if (!chat.mFromID.isNull() && + LLAvatarNameCache::get(chat.mFromID, &av_name) && + !av_name.isDisplayNameDefault()) + { + from_name = av_name.getCompleteName(); + } + message = from_name + message; } if (square_brackets) |