| 61 |
#include "llnotify.h" |
#include "llnotify.h" |
| 62 |
#include "llresmgr.h" |
#include "llresmgr.h" |
| 63 |
#include "lltabcontainer.h" |
#include "lltabcontainer.h" |
| 64 |
|
#include "llversionviewer.h" |
| 65 |
#include "llviewertexteditor.h" |
#include "llviewertexteditor.h" |
| 66 |
#include "llviewermessage.h" |
#include "llviewermessage.h" |
| 67 |
#include "llviewerstats.h" |
#include "llviewerstats.h" |
| 1180 |
// enable line history support for instant message bar |
// enable line history support for instant message bar |
| 1181 |
mInputEditor->setEnableLineHistory(TRUE); |
mInputEditor->setEnableLineHistory(TRUE); |
| 1182 |
|
|
| 1183 |
if ( gSavedPerAccountSettings.getBOOL("LogShowHistory") ) |
if (FORCE_LOG_CHAT_IM || gSavedPerAccountSettings.getBOOL("LogShowHistory") ) |
| 1184 |
{ |
{ |
| 1185 |
LLLogChat::loadHistory(mSessionLabel, |
LLLogChat::loadHistory(mSessionLabel, |
| 1186 |
&chatFromLogFile, |
&chatFromLogFile, |
| 1540 |
mHistoryEditor->appendColoredText(utf8msg, false, prepend_newline, color); |
mHistoryEditor->appendColoredText(utf8msg, false, prepend_newline, color); |
| 1541 |
|
|
| 1542 |
if (log_to_file |
if (log_to_file |
| 1543 |
&& gSavedPerAccountSettings.getBOOL("LogInstantMessages") ) |
&& (FORCE_LOG_CHAT_IM || gSavedPerAccountSettings.getBOOL("LogInstantMessages"))) |
| 1544 |
{ |
{ |
| 1545 |
std::string histstr; |
std::string histstr; |
| 1546 |
if (gSavedPerAccountSettings.getBOOL("IMLogTimestamp")) |
if (FORCE_LOG_CHAT_IM || gSavedPerAccountSettings.getBOOL("IMLogTimestamp")) |
| 1547 |
histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + name + utf8msg; |
histstr = LLLogChat::timestamp(FORCE_LOG_CHAT_IM || gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + name + utf8msg; |
| 1548 |
else |
else |
| 1549 |
histstr = name + utf8msg; |
histstr = name + utf8msg; |
| 1550 |
|
|
| 2272 |
{ |
{ |
| 2273 |
case LLLogChat::LOG_EMPTY: |
case LLLogChat::LOG_EMPTY: |
| 2274 |
// add warning log enabled message |
// add warning log enabled message |
| 2275 |
if (gSavedPerAccountSettings.getBOOL("LogInstantMessages")) |
if (FORCE_LOG_CHAT_IM || gSavedPerAccountSettings.getBOOL("LogInstantMessages")) |
| 2276 |
{ |
{ |
| 2277 |
message = LLFloaterChat::getInstance()->getString("IM_logging_string"); |
message = LLFloaterChat::getInstance()->getString("IM_logging_string"); |
| 2278 |
} |
} |
| 2279 |
break; |
break; |
| 2280 |
case LLLogChat::LOG_END: |
case LLLogChat::LOG_END: |
| 2281 |
// add log end message |
// add log end message |
| 2282 |
if (gSavedPerAccountSettings.getBOOL("LogInstantMessages")) |
if (FORCE_LOG_CHAT_IM || gSavedPerAccountSettings.getBOOL("LogInstantMessages")) |
| 2283 |
{ |
{ |
| 2284 |
message = LLFloaterChat::getInstance()->getString("IM_logging_string"); |
message = LLFloaterChat::getInstance()->getString("IM_logging_string"); |
| 2285 |
} |
} |