summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateremojipicker.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <118752495+marchcat@users.noreply.github.com>2025-11-18 03:26:24 +0200
committerGitHub <noreply@github.com>2025-11-18 03:26:24 +0200
commite8f2ec678285f15be9fd44550d9b967a9485d9f0 (patch)
treecf444a5b3ad3041e36b3e11307b2c6907badabda /indra/newview/llfloateremojipicker.cpp
parent2a620a9447b7d0544d5c500d88b4128565486018 (diff)
parentceba070dcb42609ca267bdc5dac003db7aa2ad09 (diff)
Merge pull request #4997 from secondlife/marchcat/slua-2508
Update SLua editor with latest 2025.08
Diffstat (limited to 'indra/newview/llfloateremojipicker.cpp')
-rw-r--r--indra/newview/llfloateremojipicker.cpp9
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);