diff options
| author | McCabe Maxsted | 2009-03-01 06:18:48 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-03-01 06:18:48 -0700 |
| commit | 5da3caef4c8f36cdf672e4178fc30346814f14bc (patch) | |
| tree | de5a37e4827e91ea8e36453a9b4dc728ddb26d86 /linden/indra/newview/llfloaterchat.cpp | |
| parent | Fixed pause button texture showing up in certain instances (diff) | |
| download | meta-impy-5da3caef4c8f36cdf672e4178fc30346814f14bc.zip meta-impy-5da3caef4c8f36cdf672e4178fc30346814f14bc.tar.gz meta-impy-5da3caef4c8f36cdf672e4178fc30346814f14bc.tar.bz2 meta-impy-5da3caef4c8f36cdf672e4178fc30346814f14bc.tar.xz | |
Backported fix for VWR-6744 (No way to hide IMs in chat console)
Diffstat (limited to 'linden/indra/newview/llfloaterchat.cpp')
| -rw-r--r-- | linden/indra/newview/llfloaterchat.cpp | 6 |
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, | |||
| 385 | text_color = gSavedSettings.getColor("IMChatColor"); | 385 | text_color = gSavedSettings.getColor("IMChatColor"); |
| 386 | size = INSTANT_MSG_SIZE; | 386 | size = INSTANT_MSG_SIZE; |
| 387 | } | 387 | } |
| 388 | gConsole->addLine(chat.mText, size, text_color); | 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") ) | ||
| 390 | { | ||
| 391 | gConsole->addLine(chat.mText, size, text_color); | ||
| 392 | } | ||
| 389 | } | 393 | } |
| 390 | 394 | ||
| 391 | if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM")) | 395 | if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM")) |