diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-04-19 21:14:33 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-04-19 21:14:33 +0800 |
| commit | 9595a3dee48eb8b7f10cad02b4ebdda5f596664e (patch) | |
| tree | aadbfc379b2028e1f22662d38b1094c745064ad9 /indra/newview/llimview.cpp | |
| parent | ad9c801edb13568657c0964ebfb74257da6d9e00 (diff) | |
| parent | 9a333e65c4019540d5675e72ac57ef5ab106aab0 (diff) | |
Merge tag 'Second_Life_Release#9a333e65-2025.04' into 2025.04
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 756f3b33ed..77451a6248 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3144,9 +3144,16 @@ void LLIMMgr::addMessage( const LLUUID& region_id, const LLVector3& position, bool is_region_msg, - U32 timestamp) // May be zero + U32 timestamp, // May be zero + LLUUID display_id, + std::string_view display_name) { LLUUID other_participant_id = target_id; + std::string message_display_name = (display_name.empty()) ? from : std::string(display_name); + if (display_id.isNull() && (display_name.empty())) + { + display_id = other_participant_id; + } LLUUID new_session_id = session_id; if (new_session_id.isNull()) @@ -3243,7 +3250,7 @@ void LLIMMgr::addMessage( } //Play sound for new conversations - if (!skip_message & !gAgent.isDoNotDisturb() && (gSavedSettings.getBOOL("PlaySoundNewConversation"))) + if (!skip_message && !gAgent.isDoNotDisturb() && (gSavedSettings.getBOOL("PlaySoundNewConversation"))) { make_ui_sound("UISndNewIncomingIMSession"); } @@ -3257,7 +3264,7 @@ void LLIMMgr::addMessage( if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message) { - LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg, true, is_region_msg, timestamp); + LLIMModel::instance().addMessage(new_session_id, message_display_name, display_id, msg, true, is_region_msg, timestamp); } // Open conversation floater if offline messages are present |