From 0aa68e46fb67db3c90ac3d193bfa99509dca8100 Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Thu, 31 Jan 2013 14:57:09 +0200
Subject: CHUI-711 FIXED Load logs from file only once to avoid duplicating.
 This will also solve problem with chui-710.

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

(limited to 'indra/newview/llconversationlog.cpp')

diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index 772753e7d1..c68a96ef5d 100644
--- a/indra/newview/llconversationlog.cpp
+++ b/indra/newview/llconversationlog.cpp
@@ -194,6 +194,7 @@ LLConversationLog::LLConversationLog() :
 
 	if (log_mode > 0)
 	{
+		loadFromFile(getFileName());
 		keep_log_ctrlp->getSignal()->connect(boost::bind(&LLConversationLog::enableLogging, this, _2));
 		enableLogging(log_mode);
 	}
@@ -203,8 +204,6 @@ void LLConversationLog::enableLogging(S32 log_mode)
 {
 	if (log_mode > 0)
 	{
-		loadFromFile(getFileName());
-
 		LLIMMgr::instance().addSessionObserver(this);
 		mNewMessageSignalConnection = LLIMModel::instance().addNewMsgCallback(boost::bind(&LLConversationLog::onNewMessageReceived, this, _1));
 
-- 
cgit v1.2.3