Second Life viewer sources 1.23.2-RC

1 files changed, 1 insertions, 4 deletions

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 682ed8e..ea529d1 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -398,7 +398,7 @@ void LLFloaterChat::addChat(const LLChat& chat,
                         size = INSTANT_MSG_SIZE;
                 }
                 // We display anything if it's not an IM. If it's an IM, check pref...
-                if      ( !from_instant_message || gSavedSettings.getBOOL("IMInChatHistory") ) 
+                if      ( !from_instant_message || gSavedSettings.getBOOL("IMInChatConsole") ) 
                 {
                         gConsole->addLine(chat.mText, size, text_color);
                 }
@@ -406,9 +406,6 @@ void LLFloaterChat::addChat(const LLChat& chat,
 
         if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM"))
                 log_chat_text(chat);
-        
-        if(from_instant_message && gSavedSettings.getBOOL("IMInChatHistory"))
-                addChatHistory(chat,false);
 
         LLTextParser* highlight = LLTextParser::getInstance();
         highlight->triggerAlerts(gAgent.getID(), gAgent.getPositionGlobal(), chat.mText, gViewerWindow->getWindow());