summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaxim@mnikolenko <maxim@mnikolenko>2013-01-31 14:57:09 +0200
committermaxim@mnikolenko <maxim@mnikolenko>2013-01-31 14:57:09 +0200
commit0aa68e46fb67db3c90ac3d193bfa99509dca8100 (patch)
treee2aa5fd80356f11e10de5761ce74d26e684b06ae
parent84148762d974e728dbcb33f16aa641054ab0b641 (diff)
CHUI-711 FIXED Load logs from file only once to avoid duplicating. This will also solve problem with chui-710.
-rw-r--r--indra/newview/llconversationlog.cpp3
1 files changed, 1 insertions, 2 deletions
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));