diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-12 04:39:27 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-12 04:39:27 +0200 |
commit | bb28e9e4aa0edb06b8824eb3b8245f559980ba03 (patch) | |
tree | 954bba5a694c24c63c8c880e26f8a97870b6d9ea /indra/newview/llimview.cpp | |
parent | f9866a3543e1e13404891c949a3ceca482d2f649 (diff) |
DRTVWR-573 post-merge buildfix
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r-- | indra/newview/llimview.cpp | 7 |
1 files changed, 4 insertions, 3 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); } |