From 1b464fae878550c22c98d9773e33be289447b503 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 21 Feb 2013 15:06:06 +0200
Subject: CHUI-783 FIXED Load logs from conversation.log file after changing
 preferences.

---
 indra/newview/llconversationlog.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index fc3bc8551c..b777edba77 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));
 
-- 
cgit v1.2.3