diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-22 05:50:50 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-22 05:50:50 +0800 |
| commit | 0a11db8b5d0ace1b83c1b542bc966913fecb3f2a (patch) | |
| tree | 3ab0baf0cc0d0a281f21be67ffcae7bc770c17a1 /indra/newview/llimview.cpp | |
| parent | f900a9ae67c61b3e53c36c119440cbc3710a2f7c (diff) | |
| parent | a31b7ae2419b4f644ddf559274f650e34212338e (diff) | |
Merge tag 'Second_Life_Release#a31b7ae2-Second_Life_Release#a31b7ae-2025.04' into 2025.04
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 4017cd9629..0a941403f2 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3263,7 +3263,11 @@ void LLIMMgr::addMessage( //Play sound for new conversations if (!skip_message && !gAgent.isDoNotDisturb() && (gSavedSettings.getBOOL("PlaySoundNewConversation"))) { - make_ui_sound("UISndNewIncomingIMSession"); + static LLCachedControl<bool> play_snd_mention_pref(gSavedSettings, "PlaySoundChatMention", false); + if (!play_snd_mention_pref || !LLUrlRegistry::getInstance()->containsAgentMention(msg)) + { + make_ui_sound("UISndNewIncomingIMSession"); + } } } else |