livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-4597 FIXED Show emoted name according to name settings in preferences.

meow-7.2.2
Mnikolenko ProductEngine 2014-10-27 13:26:17 +02:00
parent d524c76822
commit e3f62a54e6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llchathistory.cpp
View File

@ -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)