From 13bd0ae839e7c0e4e662c4b58aef2a1c08101cf6 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 23 Jul 2013 15:15:29 +0200
Subject: [PATCH] Fix avatar names getting duplicated in chat history

---
 indra/newview/fschathistory.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp
index f6ec3d6283..84faa45928 100644
--- a/indra/newview/fschathistory.cpp
+++ b/indra/newview/fschathistory.cpp
@@ -1073,8 +1073,14 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 				else
 				{
 				// Add link to avatar's inspector and delimiter to message.
-					appendText(std::string(link_params.link_href) + delimiter,
-							prependNewLineState, link_params);
+					// <FS:Ansariel> Append delimiter with different style params or
+					//               it will be replaced with the avatar name once it's
+					//               returned from the server!
+					//appendText(std::string(link_params.link_href) + delimiter,
+					//		prependNewLineState, link_params);
+					appendText(std::string(link_params.link_href), prependNewLineState, link_params);
+					appendText(delimiter, prependNewLineState, body_message_params);
+					// </FS:Ansariel>
 					prependNewLineState = false;
 				}
 			}