Diff of /trunk/linden/indra/newview/llfloaterchat.cpp
Parent Directory
| 
Revision Log
| 
Patch
| revision 133, Mon May 4 18:15:39 2009 UTC | revision 134, Wed May 6 20:32:39 2009 UTC | |
|---|---|---|
| # | Line 61 | Line 61 |
| 61 | //#include "llresizehandle.h" | //#include "llresizehandle.h" |
| 62 | #include "llchatbar.h" | #include "llchatbar.h" |
| 63 | #include "llstatusbar.h" | #include "llstatusbar.h" |
| 64 | #include "llversionviewer.h" | |
| 65 | #include "llviewertexteditor.h" | #include "llviewertexteditor.h" |
| 66 | #include "llviewergesture.h" // for triggering gestures | #include "llviewergesture.h" // for triggering gestures |
| 67 | #include "llviewermessage.h" | #include "llviewermessage.h" |
| # | Line 233 | Line 234 |
| 234 | void log_chat_text(const LLChat& chat) | void log_chat_text(const LLChat& chat) |
| 235 | { | { |
| 236 | std::string histstr; | std::string histstr; |
| 237 | if (gSavedPerAccountSettings.getBOOL("LogChatTimestamp")) | if (FORCE_LOG_CHAT_IM || gSavedPerAccountSettings.getBOOL("LogChatTimestamp")) |
| 238 | histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + chat.mText; | histstr = LLLogChat::timestamp(FORCE_LOG_CHAT_IM || gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + chat.mText; |
| 239 | else | else |
| 240 | histstr = chat.mText; | histstr = chat.mText; |
| 241 | ||
| # | Line 243 | Line 244 |
| 244 | // static | // static |
| 245 | void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file) | void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file) |
| 246 | { | { |
| 247 | if ( gSavedPerAccountSettings.getBOOL("LogChat") && log_to_file) | if ((FORCE_LOG_CHAT_IM || gSavedPerAccountSettings.getBOOL("LogChat")) && log_to_file) |
| 248 | { | { |
| 249 | log_chat_text(chat); | log_chat_text(chat); |
| 250 | } | } |
|
||||||||
| ViewVC Help | |
| Powered by ViewVC 1.0.0 |
