From 17e9bcbf628aa5bda84a36fc7daa9c6041e1bada Mon Sep 17 00:00:00 2001 From: mobserveur Date: Tue, 23 Jul 2024 03:06:59 +0200 Subject: Legacy search floater This commit adds the legacy search floater to megapahit --- indra/newview/llviewerinput.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/llviewerinput.cpp') diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp index 4d7d331433..c63f7338ed 100644 --- a/indra/newview/llviewerinput.cpp +++ b/indra/newview/llviewerinput.cpp @@ -48,6 +48,9 @@ #include "llinitparam.h" #include "llselectmgr.h" +#include "llfloaterwebcontent.h" +#include "fsfloatersearch.h" + // // Constants // @@ -648,6 +651,12 @@ bool start_chat( EKeystate s ) bool start_gesture( EKeystate s ) { + LLFloater* focused_floater = gFloaterView->getFocusedFloater(); + if (focused_floater && (dynamic_cast(focused_floater) || dynamic_cast(focused_floater))) + { + return true; + } + LLUICtrl* focus_ctrlp = dynamic_cast(gFocusMgr.getKeyboardFocus()); if (KEYSTATE_UP == s && ! (focus_ctrlp && focus_ctrlp->acceptsTextInput())) -- cgit v1.2.3