diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-22 18:54:21 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-22 18:54:21 -0800 |
| commit | 58208df2263f1c673354e82b10422002e9503fc2 (patch) | |
| tree | 8521405f12e88e899eec5b9bc3acf83a49b178e2 /indra/newview/llconversationlog.cpp | |
| parent | 05f4e8a10517b3b341359a210aeb0af06c44d43a (diff) | |
| parent | 5284da1acee1c92f2d465088cee7488d5de2c8b3 (diff) | |
merge
Diffstat (limited to 'indra/newview/llconversationlog.cpp')
| -rw-r--r-- | indra/newview/llconversationlog.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index 88671a789f..4953bcbd02 100644 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -206,6 +206,8 @@ void LLConversationLog::enableLogging(S32 log_mode) mLoggingEnabled = log_mode > 0; if (log_mode > 0) { + mConversations.clear(); + loadFromFile(getFileName()); LLIMMgr::instance().addSessionObserver(this); mNewMessageSignalConnection = LLIMModel::instance().addNewMsgCallback(boost::bind(&LLConversationLog::onNewMessageReceived, this, _1)); |