diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp
index 8e4ea24b0b..c6565ef73b 100644
--- a/indra/newview/fschathistory.cpp
+++ b/indra/newview/fschathistory.cpp
@@ -1282,16 +1282,6 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
message = chat.mFromName + message;
}
- // Optional muted chat history
- if (chat.mMuted)
- {
- LLUIColor muted_text_color = LLUIColorTable::instance().getColor("ChatHistoryMutedTextColor");
- body_message_params.color = muted_text_color;
- body_message_params.readonly_color = muted_text_color;
- body_message_params.selected_color = muted_text_color;
- }
- // Optional muted chat history
-
if(chat.mSourceType != CHAT_SOURCE_OBJECT && (chat.mChatType == CHAT_TYPE_IM || chat.mChatType == CHAT_TYPE_IM_GROUP)) // FS::LO Fix for FIRE-6334; Fade IM Text into background of chat history default setting should not be 0.5; made object IM text not fade into the background as per phoenix behavior.
{
body_message_params.color.alpha = FSIMChatHistoryFade;
diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp
index 2c724f12f5..a2e825b4e7 100755
--- a/indra/newview/llviewerchat.cpp
+++ b/indra/newview/llviewerchat.cpp
@@ -50,11 +50,13 @@ LLViewerChat::font_change_signal_t LLViewerChat::sChatFontChangedSignal;
//static
void LLViewerChat::getChatColor(const LLChat& chat, LLColor4& r_color, bool is_local)
{
- if(chat.mMuted)
- {
- r_color= LLUIColorTable::instance().getColor("LtGray");
- }
- else
+ // FIRE-1061 - Color friends, lindens, muted, etc
+ //if(chat.mMuted)
+ //{
+ // r_color= LLUIColorTable::instance().getColor("LtGray");
+ //}
+ //else
+ //
{
switch(chat.mSourceType)
{
diff --git a/indra/newview/skins/ansastorm/colors.xml b/indra/newview/skins/ansastorm/colors.xml
index ba379afb0e..d169f932f8 100644
--- a/indra/newview/skins/ansastorm/colors.xml
+++ b/indra/newview/skins/ansastorm/colors.xml
@@ -519,9 +519,6 @@
-
diff --git a/indra/newview/skins/ansastorm/themes/classic_brown/colors.xml b/indra/newview/skins/ansastorm/themes/classic_brown/colors.xml
index 496c7fc0a3..e743e9fa5a 100644
--- a/indra/newview/skins/ansastorm/themes/classic_brown/colors.xml
+++ b/indra/newview/skins/ansastorm/themes/classic_brown/colors.xml
@@ -519,9 +519,6 @@
-
diff --git a/indra/newview/skins/ansastorm/themes/ectoplasma/colors.xml b/indra/newview/skins/ansastorm/themes/ectoplasma/colors.xml
index 14d521a58e..fdbaf8410b 100644
--- a/indra/newview/skins/ansastorm/themes/ectoplasma/colors.xml
+++ b/indra/newview/skins/ansastorm/themes/ectoplasma/colors.xml
@@ -482,9 +482,6 @@
-
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 3d1c431bd5..ded9c5599c 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -466,9 +466,6 @@
-