summaryrefslogtreecommitdiff
path: root/indra/newview/llimpanel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llimpanel.cpp')
-rw-r--r--indra/newview/llimpanel.cpp10
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