diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-17 14:16:47 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-17 14:16:47 -0800 |
| commit | 09163617c2c5e79d8e51b5ceca5b5282effcb1f6 (patch) | |
| tree | 00ca15b9d3f3c336ac357413c38f87028ba4e1ee /indra/newview/llconversationlog.cpp | |
| parent | e8bff548ff7374c263c2bc38a337e8841bc2761f (diff) | |
| parent | ed52792396c76ead787207b7a7dc3968f4352a1d (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui.
Diffstat (limited to 'indra/newview/llconversationlog.cpp')
| -rw-r--r-- | indra/newview/llconversationlog.cpp | 3 |
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); } |