diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-18 19:17:38 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-18 19:17:38 +0200 |
| commit | ef58be0f74262fbc034f1b9b3ba4fa7ee6d16225 (patch) | |
| tree | e5c2e934f441341902e825b912dae8e161f3351b /indra/newview/llfloaterconversationlog.cpp | |
| parent | 355e7a061311df30f019fd722df6072b745b0ef6 (diff) | |
| parent | e64c8fdc145c6ae2727173d310a732a471aaf569 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterconversationlog.cpp')
| -rw-r--r-- | indra/newview/llfloaterconversationlog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterconversationlog.cpp b/indra/newview/llfloaterconversationlog.cpp index 089aec1905..a40a000bab 100644 --- a/indra/newview/llfloaterconversationlog.cpp +++ b/indra/newview/llfloaterconversationlog.cpp @@ -67,7 +67,8 @@ BOOL LLFloaterConversationLog::postBuild() if (ctrl) { ctrl->getSignal()->connect(boost::bind(&LLFloaterConversationLog::onCallLoggingEnabledDisabled, this, _2)); - onCallLoggingEnabledDisabled(ctrl->getValue().asBoolean()); + onCallLoggingEnabledDisabled(ctrl->getValue().asBoolean() + && gSavedSettings.getBOOL("KeepConversationLogTranscripts")); } return LLFloater::postBuild(); |