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.h | |
| parent | f9866a3543e1e13404891c949a3ceca482d2f649 (diff) | |
DRTVWR-573 post-merge buildfix
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |