summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-02-11 20:02:19 +0000
committerCho <cho@lindenlab.com>2013-02-11 20:02:19 +0000
commit33d49d15693de15527960476b816845f8b3d6d54 (patch)
tree08be5fffff2490d546c01ba3aacdb014b0eb87c2 /indra/newview/llimview.cpp
parent5066e850df6e44e65bf7760ac990fdd5ed1c7b8e (diff)
CHUI-755 FIX Conversation log changes in a session are lost if viewer crashes
Added call to LLConversationLog::instance().cache() after LLLogChat::SaveHistory() in LLIMView::logToFile()
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 2eaef48049..cdf6cb6252 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -66,6 +66,7 @@
#include "lltoolbarview.h"
#include "llviewercontrol.h"
#include "llviewerparcelmgr.h"
+#include "llconversationlog.h"
#include "message.h"
@@ -950,6 +951,7 @@ bool LLIMModel::logToFile(const std::string& file_name, const std::string& from,
}
LLLogChat::saveHistory(file_name, from_name, from_id, utf8_text);
+ LLConversationLog::instance().cache(); // update the conversation log too
return true;
}
else