From a83779ae38d50343b5ce84fe9706be6bedcc866f Mon Sep 17 00:00:00 2001 From: Liny Date: Sat, 14 Apr 2012 23:13:09 -0700 Subject: [PATCH] Forgotten code path for when display names are turned off and showing group names in chat history when chat headers were disabled as well. --- indra/newview/llchathistory.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 7aaed9a648..38257396b6 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -1084,7 +1084,17 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL } else { - mEditor->appendText(chat.mFromName, false, link_params); + //mEditor->appendText(chat.mFromName, false, link_params); + // FS:LO FIRE-5230 - Chat Console Improvement: Replacing the "IM" in front of group chat messages with the actual group name + if (chat.mChatType == CHAT_TYPE_IM_GROUP) + { + mEditor->appendText(chat.mFromNameGroup + chat.mFromName, false, link_params); + } + else + { + mEditor->appendText(chat.mFromName, false, link_params); + } + // FS:LO FIRE-5230 - Chat Console Improvement: Replacing the "IM" in front of group chat messages with the actual group name } link_params.color(txt_color); link_params.readonly_color(txt_color);