--- linden/indra/newview/llfloaterchat.cpp	Tue Jun 26 16:49:34 2007
+++ linden/indra/newview/llfloaterchat.cpp	Thu Jun 28 22:35:15 2007
@@ -168,12 +168,10 @@
 		log_chat_text(chat);
 	}
 	
 	LLColor4 color = get_text_color(chat);
 	
-	if (!log_to_file) color = LLColor4::grey;	//Recap from log file.
-
 	if (chat.mChatType == CHAT_TYPE_DEBUG_MSG)
 	{
 		LLFloaterScriptDebug::addScriptLine(chat.mText,
 											chat.mFromName, 
 											color, 
@@ -368,19 +366,26 @@
 		F32 size = CHAT_MSG_SIZE;
 		if(from_instant_message)
 		{
 			text_color = INSTANT_MSG_COLOR;
 			size = INSTANT_MSG_SIZE;
+			if(gSavedSettings.getBOOL("IMInChatHistory"))
+				gConsole->addLine(chat.mText, size, text_color);
+		}
+		else
+		{
+			gConsole->addLine(chat.mText, size, text_color);
 		}
-		gConsole->addLine(chat.mText, size, text_color);
 	}
 
 	if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM"))
 		log_chat_text(chat);
 	
 	if(from_instant_message && gSavedSettings.getBOOL("IMInChatHistory"))
+	{
 		addChatHistory(chat,false);
+	}
 	
 	if(!from_instant_message)
 		addChatHistory(chat);
 }
 
@@ -435,10 +440,15 @@
 			{
 				// diminish far-off chat
 				text_color.mV[VALPHA] = 0.8f;
 			}
 		}
+
+		if (chat.mAudible == CHAT_AUDIBLE_NOT)
+		{
+			text_color.mV[VALPHA] = 0.7f;
+		}
 	}
 
 	return text_color;
 }
 
@@ -452,7 +462,8 @@
 void LLFloaterChat::chatFromLogFile(LLString line, void* userdata)
 {
 	LLChat chat;
 				
 	chat.mText = line;
+	chat.mAudible = CHAT_AUDIBLE_NOT;
 	addChatHistory(chat,  FALSE);
 }