diff options
| -rw-r--r-- | indra/newview/llimview.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llimview.h | 4 | 
2 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index c9f09e07cf..439e87564a 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1224,7 +1224,7 @@ void LLIMModel::proccessOnlineOfflineNotification(  }  void 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 */, bool is_region_msg /* = false */) {      if (gSavedSettings.getBOOL("TranslateChat") && (from != SYSTEM_FROM))      { @@ -1237,12 +1237,12 @@ void LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, co      }      else      { -        processAddingMessage(session_id, from, from_id, utf8_text, log2file); +        processAddingMessage(session_id, from, from_id, utf8_text, log2file, is_region_msg);      }  }  void LLIMModel::processAddingMessage(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 */, bool is_region_msg /* = false */)  {      LLIMSession* session = addMessageSilently(session_id, from, from_id, utf8_text, log2file);      if (!session) return; @@ -1263,6 +1263,7 @@ void LLIMModel::processAddingMessage(const LLUUID& session_id, const std::string      arg["from_id"] = from_id;      arg["time"] = LLLogChat::timestamp(false);      arg["session_type"] = session->mSessionType; +    arg["is_region_msg"] = is_region_msg;      mNewMsgSignal(arg);  } diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index c0d30317d0..5e99cc7fca 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -208,8 +208,8 @@ public:  	 * and also saved into a file if log2file is specified.  	 * It sends new message signal for each added message.  	 */ -	void addMessage(const LLUUID& session_id, const std::string& from, const LLUUID& other_participant_id, const std::string& utf8_text, bool log2file = true, bool is_region_msg = false); -    void processAddingMessage(const LLUUID& session_id, const std::string& from, const LLUUID& other_participant_id, const std::string& utf8_text, bool log2file = true); +	void addMessage(const LLUUID& session_id, const std::string& from, const LLUUID& from_id, const std::string& utf8_text, bool log2file = true, bool is_region_msg = false); +    void processAddingMessage(const LLUUID& session_id, const std::string& from, const LLUUID& from_id, const std::string& utf8_text, bool log2file = true, bool is_region_msg = false);  	/**  	 * Similar to addMessage(...) above but won't send a signal about a new message added  | 
