Merge branch 'gst-revamp' into next

1 files changed, 5 insertions, 1 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"))