2 files changed, 6 insertions, 2 deletions

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" />
         <check_box bottom="-65" control_name="IMInChatHistory" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Include IM in Local Chat" left="148" mouse_opaque="true"
+             label="Show IMs with Chat" left="148" mouse_opaque="true"
              name="include_im_in_chat_history" radio_style="false" width="237" />
         <check_box bottom="-85" control_name="IMShowTimestamps" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"