summaryrefslogtreecommitdiff
path: root/indra/llui/llfocusmgr.cpp
diff options
context:
space:
mode:
authorKelly Washington <kelly@lindenlab.com>2010-09-24 15:57:17 -0700
committerKelly Washington <kelly@lindenlab.com>2010-09-24 15:57:17 -0700
commitd129d6ee23995d0a5e89aa71e56d6ed6aa95761e (patch)
tree0f8ff06e67af5cf7e3c031432c6ed1f25717866f /indra/llui/llfocusmgr.cpp
parent22228896ee2ce6f20d67ce2c4a415fcd40d6b6e0 (diff)
VWR-21377 Script editor ctrl-f fix.
let some LLViews handle shortcut keys if they want. reviewed with ambroff
Diffstat (limited to 'indra/llui/llfocusmgr.cpp')
-rw-r--r--indra/llui/llfocusmgr.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 1f16d12add..7fbfd80d8d 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -315,6 +315,20 @@ void LLFocusMgr::removeKeyboardFocusWithoutCallback( const LLFocusableElement* f
}
}
+bool LLFocusMgr::keyboardFocusHasMenus() const
+{
+ LLView* focus_view = dynamic_cast<LLView*>(mKeyboardFocus);
+ while( focus_view )
+ {
+ if(focus_view->hasMenus())
+ {
+ return true;
+ }
+
+ focus_view = focus_view->getParent();
+ }
+ return false;
+}
void LLFocusMgr::setMouseCapture( LLMouseHandler* new_captor )
{