diff options
| author | Jacek Antonelli | 2009-06-13 13:17:14 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-06-13 13:17:20 -0500 |
| commit | 0517fe4322443bdc317f8185590a63134e3f8394 (patch) | |
| tree | 942c9c26d0792accc928010a113d123c5409659b /linden/indra/newview/llfloaterchat.cpp | |
| parent | Second Life viewer sources 1.23.2-RC (diff) | |
| download | meta-impy-0517fe4322443bdc317f8185590a63134e3f8394.zip meta-impy-0517fe4322443bdc317f8185590a63134e3f8394.tar.gz meta-impy-0517fe4322443bdc317f8185590a63134e3f8394.tar.bz2 meta-impy-0517fe4322443bdc317f8185590a63134e3f8394.tar.xz | |
Second Life viewer sources 1.23.3-RC
Diffstat (limited to 'linden/indra/newview/llfloaterchat.cpp')
| -rw-r--r-- | linden/indra/newview/llfloaterchat.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp index ea529d1..0e9295f 100644 --- a/linden/indra/newview/llfloaterchat.cpp +++ b/linden/indra/newview/llfloaterchat.cpp | |||
| @@ -406,6 +406,9 @@ void LLFloaterChat::addChat(const LLChat& chat, | |||
| 406 | 406 | ||
| 407 | if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM")) | 407 | if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM")) |
| 408 | log_chat_text(chat); | 408 | log_chat_text(chat); |
| 409 | |||
| 410 | if(from_instant_message && gSavedSettings.getBOOL("IMInChatHistory")) | ||
| 411 | addChatHistory(chat,false); | ||
| 409 | 412 | ||
| 410 | LLTextParser* highlight = LLTextParser::getInstance(); | 413 | LLTextParser* highlight = LLTextParser::getInstance(); |
| 411 | highlight->triggerAlerts(gAgent.getID(), gAgent.getPositionGlobal(), chat.mText, gViewerWindow->getWindow()); | 414 | highlight->triggerAlerts(gAgent.getID(), gAgent.getPositionGlobal(), chat.mText, gViewerWindow->getWindow()); |