diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-27 10:08:02 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-27 10:08:02 +0800 |
| commit | 06e8f0c443c1ba7858d000c6d695b7e988e02053 (patch) | |
| tree | bccd8f5b70e24934eff26cab934cd4ecf5864825 /indra/newview/llviewerinput.cpp | |
| parent | 790e708ffc1cb138a484249b3ac7f240be21dd98 (diff) | |
| parent | 591ecf748a620f7528d498e576271a33df5366ee (diff) | |
Merge branch 'main' into webrtc-voice
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())) |