merge

1 files changed, 13 insertions, 2 deletions

diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index d1922cfd6e..6d8d11ad2b 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -333,7 +333,7 @@ LLView* LLChatHistory::getHeader(const LLChat& chat,const LLStyle::Params& style
 	return header;
 }
 
-void LLChatHistory::appendWidgetMessage(const LLChat& chat, LLStyle::Params& style_params)
+void LLChatHistory::appendWidgetMessage(const LLChat& chat)
 {
 	LLView* view = NULL;
 	std::string view_text = "\n[" + formatCurrentTime() + "] " + chat.mFromName + ": ";
@@ -371,7 +371,18 @@ void LLChatHistory::appendWidgetMessage(const LLChat& chat, LLStyle::Params& sty
 	appendWidget(p, view_text, false);
 
 	//Append the text message
-	appendText(chat.mText, FALSE, style_params);
+
+	LLColor4 txt_color = LLUIColorTable::instance().getColor("White");
+	LLViewerChat::getChatColor(chat,txt_color);
+	LLFontGL* fontp = LLViewerChat::getChatFont();
+	
+	std::string message = chat.mText + '\n';
+	
+	LLStyle::Params style_params;
+	style_params.color(txt_color);
+	style_params.font(fontp);
+	
+	appendText(message, FALSE, style_params);
 
 	mLastFromName = chat.mFromName;
 	blockUndo();