Merge branch 'release/2025.08' into marchcat/slua-2508

# Conflicts:
#	autobuild.xml

1 files changed, 9 insertions, 0 deletions

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index c5f4a2f0cf..ab76f3473b 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -377,6 +377,9 @@ void LLFloaterEmojiPicker::initialize()
     {
         if (!mHint.empty())
         {
+            // Hack: Trying to open floater, search for a match,
+            // and hide floater immediately if no match found,
+            // instead of checking prior to opening
             hideFloater();
             return;
         }
@@ -406,6 +409,12 @@ void LLFloaterEmojiPicker::initialize()
         return;
     }
 
+    if (!mHint.empty() && getSoundFlags() == LLView::SILENT)
+    {
+        // Sounds were supressed
+        make_ui_sound("UISndWindowOpen");
+    }
+
     mGroups->setVisible(true);
     mPreview->setIcon(nullptr);
     showPreview(true);