Merge

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 72fd006222..40e3a8fb69 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -146,11 +146,6 @@ public:
 	bool addMessage(const LLUUID& session_id, const std::string& from, const LLUUID& other_participant_id, const std::string& utf8_text, bool log2file = true);
 
 	/**
-	 * Adds message without new message notification.
-	 */
-	void addMessageSilently(LLIMSession& session, const std::string& from, const LLUUID& other_participant_id, const std::string& utf8_text, bool log2file = true);
-
-	/**
 	 * Add a system message to an IM Model
 	 */
 	bool proccessOnlineOfflineNotification(const LLUUID& session_id, const std::string& utf8_text);
@@ -205,6 +200,11 @@ public:
 
 	void testMessages();
 
+	/**
+	 * Saves an IM message into a file
+	 */
+	bool logToFile(const std::string& session_name, const std::string& from, const LLUUID& from_id, const std::string& utf8_text);
+
 private:
 	
 	/**