diff options
| author | William Weaver <paperwork.resident@gmail.com> | 2025-04-02 04:23:07 +0300 |
|---|---|---|
| committer | William Weaver <paperwork.resident@gmail.com> | 2025-04-02 04:23:07 +0300 |
| commit | f0ad01c7dd875ddb6d963e55da8d88cbcd7be6aa (patch) | |
| tree | ef8a303108f3402fd92a7a95910f44ec09437e97 /indra/newview/llimview.cpp | |
| parent | be595b440321dcad842be5d982d20fd601bb8b4c (diff) | |
| parent | 6110028012181f445d5f7de2a73a5bf7adb0097c (diff) | |
Merge branch 'fix/xui-parsing-fixes' of https://github.com/williamweaver/viewer into fix/xui-parsing-fixes
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 34a4b5b230..21c255f226 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3142,9 +3142,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()) @@ -3240,7 +3247,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"); } @@ -3254,7 +3261,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 |