From 733d65d0391f749608be599cefdd0a9c5b153ec0 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 12 May 2025 23:12:15 +0300
Subject: #4010 play only audio mention ping for new conversation

---
 indra/newview/llimview.cpp             | 6 +++++-
 indra/newview/skins/default/colors.xml | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 6f085adcbd..f0f25089fa 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -3260,7 +3260,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
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 0c34a3a5fb..5142e8ceff 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -1008,7 +1008,7 @@
     value="0.82 0.91 0.98 0.15" />
   <color
     name="ChatSelfMentionHighlight"
-    value="1 1 0 1" />
+    value="1 1 0 0.35" />
   <color
     name="MentionFlashBgColor"
     value="1 1 0 0.5" />
-- 
cgit v1.3