diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
| commit | 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 (patch) | |
| tree | 9c5958572368be494b6302db8b03967a2c67b7ad /indra/newview/llimpanel.cpp | |
| parent | a09f7d41efdb945755efaeb07f7418c1f6e2a78b (diff) | |
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llimpanel.cpp')
| -rw-r--r-- | indra/newview/llimpanel.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 40da1a4f3c..328cb85c1f 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -2173,11 +2173,17 @@ void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, std::string { case LLLogChat::LOG_EMPTY: // add warning log enabled message - message = LLFloaterChat::getInstance()->getUIString("IM_logging_string"); + if (gSavedPerAccountSettings.getBOOL("LogInstantMessages")) + { + message = LLFloaterChat::getInstance()->getUIString("IM_logging_string"); + } break; case LLLogChat::LOG_END: // add log end message - message = LLFloaterChat::getInstance()->getUIString("IM_logging_string"); + if (gSavedPerAccountSettings.getBOOL("LogInstantMessages")) + { + message = LLFloaterChat::getInstance()->getUIString("IM_logging_string"); + } break; case LLLogChat::LOG_LINE: // just add normal lines from file |