From faefd351638b80a0e0bd2383303acd2a50c7b297 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 29 Apr 2024 00:04:24 +0200
Subject: secondlife/viewer#1330 EmojiPicker inserts emoji to inactive chat
 floater

---
 indra/llui/llmenugl.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llui/llmenugl.cpp')

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 7381dc80a8..ff1a25aef7 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -46,6 +46,7 @@
 #include "llfocusmgr.h"
 #include "llcoord.h"
 #include "llwindow.h"
+#include "llemojihelper.h"
 #include "llcriticaldamp.h"
 #include "lluictrlfactory.h"
 
@@ -1411,6 +1412,7 @@ void LLMenuItemBranchDownGL::openMenu( void )
 	}
 	else
 	{
+		LLEmojiHelper::instance().hideHelper(nullptr, true);
 		if (branch->getTornOff())
 		{
 			LLFloater * branch_parent = dynamic_cast<LLFloater *>(branch->getParent());
-- 
cgit v1.2.3