summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationlog.cpp
diff options
context:
space:
mode:
authorMaximB ProductEngine <mberezhnoy@productengine.com>2012-12-18 19:17:38 +0200
committerMaximB ProductEngine <mberezhnoy@productengine.com>2012-12-18 19:17:38 +0200
commitef58be0f74262fbc034f1b9b3ba4fa7ee6d16225 (patch)
treee5c2e934f441341902e825b912dae8e161f3351b /indra/newview/llconversationlog.cpp
parent355e7a061311df30f019fd722df6072b745b0ef6 (diff)
parente64c8fdc145c6ae2727173d310a732a471aaf569 (diff)
merge
Diffstat (limited to 'indra/newview/llconversationlog.cpp')
-rw-r--r--indra/newview/llconversationlog.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index a0765f5e16..1171b3db41 100644
--- a/indra/newview/llconversationlog.cpp
+++ b/indra/newview/llconversationlog.cpp
@@ -191,7 +191,8 @@ LLConversationLog::LLConversationLog()
if (ctrl)
{
ctrl->getSignal()->connect(boost::bind(&LLConversationLog::enableLogging, this, _2));
- if (ctrl->getValue().asBoolean())
+ if (ctrl->getValue().asBoolean()
+ && gSavedSettings.getBOOL("KeepConversationLogTranscripts"))
{
enableLogging(true);
}