diff options
Diffstat (limited to 'indra/newview/llfloaterchat.cpp')
| -rw-r--r-- | indra/newview/llfloaterchat.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp index 793ae954ae..f57042eedb 100644 --- a/indra/newview/llfloaterchat.cpp +++ b/indra/newview/llfloaterchat.cpp @@ -393,7 +393,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")) |