From e3f62a54e6c3fe5423a1e766c4ee30388aa471bd Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 27 Oct 2014 13:26:17 +0200
Subject: MAINT-4597 FIXED Show emoted name according to name settings in
 preferences.

---
 indra/newview/llchathistory.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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)
-- 
cgit v1.2.3