Merge branch 'main' into marchcat/2505-merge

# Conflicts:
#	.github/workflows/qatest.yaml
#	indra/llcommon/llsdutil.h
#	indra/llui/llflatlistview.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitgallery.h

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index b9441a9c91..b2c59ce775 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -99,6 +99,7 @@ void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, c
         LLFloater* pHelperFloater = LLFloaterReg::getInstance(DEFAULT_EMOJI_HELPER_FLOATER);
         mHelperHandle = pHelperFloater->getHandle();
         mHelperCommitConn = pHelperFloater->setCommitCallback(std::bind([&](const LLSD& sdValue) { onCommitEmoji(utf8str_to_wstring(sdValue.asStringRef())[0]); }, std::placeholders::_2));
+        mHelperCloseConn = pHelperFloater->setCloseCallback([this](LLUICtrl* ctrl, const LLSD& param) { onCloseHelper(ctrl, param); });
     }
     setHostCtrl(hostctrl_p);
     mEmojiCommitCb = cb;
@@ -148,6 +149,16 @@ void LLEmojiHelper::onCommitEmoji(llwchar emoji)
     }
 }
 
+void LLEmojiHelper::onCloseHelper(LLUICtrl* ctrl, const LLSD& param)
+{
+    mCloseSignal(ctrl, param);
+}
+
+boost::signals2::connection LLEmojiHelper::setCloseCallback(const commit_signal_t::slot_type& cb)
+{
+    return mCloseSignal.connect(cb);
+}
+
 void LLEmojiHelper::setHostCtrl(LLUICtrl* hostctrl_p)
 {
     const LLUICtrl* pCurHostCtrl = mHostHandle.get();