From 33d49d15693de15527960476b816845f8b3d6d54 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Mon, 11 Feb 2013 20:02:19 +0000
Subject: [PATCH] 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()
---
indra/newview/llconversationlog.cpp | 2 +-
indra/newview/llconversationlog.h | 2 +-
indra/newview/llimview.cpp | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index 82176b3a067..4e707ac76ee 100644
--- a/indra/newview/llconversationlog.cpp
+++ b/indra/newview/llconversationlog.cpp
@@ -276,7 +276,7 @@ void LLConversationLog::updateConversationName(const LLIMModel::LLIMSession* ses
LLConversation* conversation = findConversation(session);
if (conversation)
{
- conversation->setConverstionName(name);
+ conversation->setConversationName(name);
notifyParticularConversationObservers(conversation->getSessionID(), LLConversationLogObserver::CHANGED_NAME);
}
}
diff --git a/indra/newview/llconversationlog.h b/indra/newview/llconversationlog.h
index d5b6eccb294..fd385561315 100644
--- a/indra/newview/llconversationlog.h
+++ b/indra/newview/llconversationlog.h
@@ -58,7 +58,7 @@ class LLConversation
const time_t& getTime() const { return mTime; }
bool hasOfflineMessages() const { return mHasOfflineIMs; }
- void setConverstionName(std::string conv_name) { mConversationName = conv_name; }
+ void setConversationName(std::string conv_name) { mConversationName = conv_name; }
void setOfflineMessages(bool new_messages) { mHasOfflineIMs = new_messages; }
bool isOlderThan(U32 days) const;
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 2eaef48049e..cdf6cb62525 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
--
GitLab