merge up to 3.6.9-release

1 files changed, 3 insertions, 13 deletions

diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index af3c6eff11..43a733f918 100755
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -898,20 +898,10 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 				LLStyle::Params link_params(body_message_params);
 				link_params.overwriteFrom(LLStyleMap::instance().lookupAgent(chat.mFromID));
 
-				if (from_me)
-				{	std::string localized_name;
-					bool is_localized = LLTrans::findString(localized_name, "AgentNameSubst");
-					mEditor->appendText((is_localized? localized_name:"(You)") + delimiter,
-							prependNewLineState, link_params);
-					prependNewLineState = false;
-				}
-				else
-				{
 				// Add link to avatar's inspector and delimiter to message.
-					mEditor->appendText(std::string(link_params.link_href) + delimiter,
-							prependNewLineState, link_params);
-					prependNewLineState = false;
-				}
+				mEditor->appendText(std::string(link_params.link_href) + delimiter,
+					prependNewLineState, link_params);
+				prependNewLineState = false;
 			}
 			else
 			{