diff options
| author | mobserveur <mobserveur@gmail.com> | 2024-07-23 03:06:59 +0200 |
|---|---|---|
| committer | mobserveur <mobserveur@gmail.com> | 2024-07-23 03:06:59 +0200 |
| commit | 17e9bcbf628aa5bda84a36fc7daa9c6041e1bada (patch) | |
| tree | b3002ee1f89bd9d97513de29f9cfe566932d6e97 /indra/newview/llviewerinput.cpp | |
| parent | 7bb6ea9103228b3bf3b28792d8d73e8616471908 (diff) | |
Legacy search floater
This commit adds the legacy search floater to megapahit
Diffstat (limited to 'indra/newview/llviewerinput.cpp')
| -rw-r--r-- | indra/newview/llviewerinput.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
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<LLFloaterWebContent*>(focused_floater) || dynamic_cast<FSFloaterSearch*>(focused_floater))) + { + return true; + } + LLUICtrl* focus_ctrlp = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus()); if (KEYSTATE_UP == s && ! (focus_ctrlp && focus_ctrlp->acceptsTextInput())) |