Skip to content
Snippets Groups Projects
Commit 1a622243 authored by Alexei Arabadji's avatar Alexei Arabadji
Browse files
--HG--
branch : product-engine
parents 38543055 9a37144a
No related branches found
No related tags found
No related merge requests found
...@@ -482,8 +482,7 @@ bool LLIMModel::proccessOnlineOfflineNotification( ...@@ -482,8 +482,7 @@ bool LLIMModel::proccessOnlineOfflineNotification(
} }
bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, const LLUUID& from_id, 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); LLIMSession* session = findIMSession(session_id);
if (!session) if (!session)
...@@ -492,7 +491,10 @@ bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, co ...@@ -492,7 +491,10 @@ bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, co
return false; 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 // notify listeners
LLSD arg; LLSD arg;
...@@ -507,15 +509,6 @@ bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, co ...@@ -507,15 +509,6 @@ bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, co
return true; 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 const std::string& LLIMModel::getName(const LLUUID& session_id) const
{ {
......
...@@ -145,11 +145,6 @@ class LLIMModel : public LLSingleton<LLIMModel> ...@@ -145,11 +145,6 @@ class LLIMModel : public LLSingleton<LLIMModel>
*/ */
bool addMessage(const LLUUID& session_id, const std::string& from, const LLUUID& other_participant_id, const std::string& utf8_text, bool log2file = true); 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 * Add a system message to an IM Model
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment