diff options
author | McCabe Maxsted | 2009-06-14 03:05:02 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-14 03:06:23 -0700 |
commit | 6d571fa8d1f9bbf73d5c2956585c33ec87201035 (patch) | |
tree | 0e2f1c6058d27092de2d04f17b90cc78dfb25f54 /linden/indra/newview/llfloaterchat.cpp | |
parent | Updated ChangeLog (diff) | |
download | meta-impy-6d571fa8d1f9bbf73d5c2956585c33ec87201035.zip meta-impy-6d571fa8d1f9bbf73d5c2956585c33ec87201035.tar.gz meta-impy-6d571fa8d1f9bbf73d5c2956585c33ec87201035.tar.bz2 meta-impy-6d571fa8d1f9bbf73d5c2956585c33ec87201035.tar.xz |
Added IM preference for showing IMs in either main or local chat
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterchat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp index 8e9d489..5117b8d 100644 --- a/linden/indra/newview/llfloaterchat.cpp +++ b/linden/indra/newview/llfloaterchat.cpp | |||
@@ -386,7 +386,7 @@ void LLFloaterChat::addChat(const LLChat& chat, | |||
386 | size = INSTANT_MSG_SIZE; | 386 | size = INSTANT_MSG_SIZE; |
387 | } | 387 | } |
388 | // We display anything if it's not an IM. If it's an IM, check pref... | 388 | // We display anything if it's not an IM. If it's an IM, check pref... |
389 | if ( !from_instant_message || gSavedSettings.getBOOL("IMInChatHistory") ) | 389 | if ( !from_instant_message || gSavedSettings.getBOOL("IMInChatConsole") ) |
390 | { | 390 | { |
391 | gConsole->addLine(chat.mText, size, text_color); | 391 | gConsole->addLine(chat.mText, size, text_color); |
392 | } | 392 | } |