From 73d192a4084132636a9a4eab9c44415bb11161dc Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 17 Feb 2010 17:43:13 +0200
Subject: fixed EXT-5367  Emotes '/me says ...' out of context when nearby chat
 or group chat window expanded.

--HG--
branch : product-engine
---
 indra/newview/llchathistory.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 3fb043c669..8625fe5900 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -796,6 +796,12 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 			}
 		}
 
+		if (irc_me && !use_plain_text_chat_history)
+		{
+			message = chat.mFromName + message;
+		}
+		
+
 		mEditor->appendText(message, FALSE, style_params);
 	}
 	mEditor->blockUndo();
-- 
cgit v1.2.3