diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimview.cpp | 17 | ||||
| -rw-r--r-- | indra/newview/llimview.h | 5 | 
2 files changed, 5 insertions, 17 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 24092bab98..827234be6e 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -482,8 +482,7 @@ bool LLIMModel::proccessOnlineOfflineNotification(  }  bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, const LLUUID& from_id,  -						   const std::string& utf8_text, bool log2file /* = true */) -{ +						   const std::string& utf8_text, bool log2file /* = true */) {   	LLIMSession* session = findIMSession(session_id);  	if (!session) @@ -492,7 +491,10 @@ bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, co  		return false;  	} -	addMessageSilently(*session, from, from_id, utf8_text, log2file); +	addToHistory(session_id, from, from_id, utf8_text); +	if (log2file) logToFile(session_id, from, from_id, utf8_text); + +	session->mNumUnread++;  	// notify listeners  	LLSD arg; @@ -507,15 +509,6 @@ bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, co  	return true;  } -void LLIMModel::addMessageSilently(LLIMSession& session, const std::string& from, const LLUUID& from_id, -						   const std::string& utf8_text, bool log2file /* = true */) -{ -	addToHistory(session.mSessionID, from, from_id, utf8_text); -	if (log2file) logToFile(session.mSessionID, from, from_id, utf8_text); - -	session.mNumUnread++; -} -  const std::string& LLIMModel::getName(const LLUUID& session_id) const  { diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 72fd006222..79b0acad69 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);  | 
