From 5da3caef4c8f36cdf672e4178fc30346814f14bc Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 1 Mar 2009 06:18:48 -0700 Subject: Backported fix for VWR-6744 (No way to hide IMs in chat console) --- linden/indra/newview/llfloaterchat.cpp | 6 +++++- .../indra/newview/skins/default/xui/en-us/panel_preferences_im.xml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp index a626ad3..14f9a10 100644 --- a/linden/indra/newview/llfloaterchat.cpp +++ b/linden/indra/newview/llfloaterchat.cpp @@ -385,7 +385,11 @@ void LLFloaterChat::addChat(const LLChat& chat, text_color = gSavedSettings.getColor("IMChatColor"); size = INSTANT_MSG_SIZE; } - gConsole->addLine(chat.mText, size, text_color); + // We display anything if it's not an IM. If it's an IM, check pref... + if ( !from_instant_message || gSavedSettings.getBOOL("IMInChatHistory") ) + { + gConsole->addLine(chat.mText, size, text_color); + } } if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM")) diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml index d3174af..8020e9a 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml @@ -28,7 +28,7 @@ width="350" />