diff options
| author | James Cook <james@lindenlab.com> | 2009-07-27 16:50:01 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-27 16:50:01 +0000 |
| commit | ca51e8f33dfa0cd455438f11902fb1d839bf6206 (patch) | |
| tree | 0e261edeab3e2e3f53a1f3ab825aa76906fff152 /indra/newview/llfloaterchat.cpp | |
| parent | f5ba6df4c2dc5a5e0842ed028dd4de01406dca3b (diff) | |
Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
Diffstat (limited to 'indra/newview/llfloaterchat.cpp')
| -rw-r--r-- | indra/newview/llfloaterchat.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp index dd0df15348..1ecbdd8e16 100644 --- a/indra/newview/llfloaterchat.cpp +++ b/indra/newview/llfloaterchat.cpp @@ -85,6 +85,7 @@ const F32 INSTANT_MSG_SIZE = 8.0f; const F32 CHAT_MSG_SIZE = 8.0f; + // // Global statics // @@ -203,7 +204,7 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4& void log_chat_text(const LLChat& chat) { std::string histstr; - if (gSavedPerAccountSettings.getBOOL("LogChatTimestamp")) + if (gSavedPerAccountSettings.getBOOL("LogTimestamp")) histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + chat.mText; else histstr = chat.mText; @@ -213,7 +214,7 @@ void log_chat_text(const LLChat& chat) // static void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file) { - if ( gSavedPerAccountSettings.getBOOL("LogChat") && log_to_file) + if ( (gSavedPerAccountSettings.getS32("IMLogOptions")!=LOG_IM) && log_to_file) { log_chat_text(chat); } @@ -367,7 +368,7 @@ void LLFloaterChat::addChat(const LLChat& chat, } } - if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM")) + if(from_instant_message && (gSavedPerAccountSettings.getS32("IMLogOptions")== LOG_BOTH_TOGETHER)) log_chat_text(chat); if(from_instant_message && gSavedSettings.getBOOL("IMInChatHistory")) |