diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-10-27 13:26:17 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-10-27 13:26:17 +0200 |
| commit | e3f62a54e6c3fe5423a1e766c4ee30388aa471bd (patch) | |
| tree | c84a98dd36cb92746918b57ba39b88a97db4550a /indra | |
| parent | d524c76822b020a2105c90b0bf0ba19ff90bc709 (diff) | |
MAINT-4597 FIXED Show emoted name according to name settings in preferences.
Diffstat (limited to 'indra')
| -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) |