livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-573 post-merge buildfix

master
Andrey Lihatskiy 2023-01-12 04:39:27 +02:00
parent f9866a3543
commit bb28e9e4aa
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llimview.cpp
View File

@ -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);
}

4
indra/newview/llimview.h
View File

@ -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