summaryrefslogtreecommitdiff
path: root/indra/llui/llfocusmgr.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-28 11:44:14 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-28 11:44:14 +0100
commit8863805d5ca446f06e73e2ba2b9e9dd35051b8fb (patch)
treeae8d2d536aa413e556e66bdbe85f2fbf67e5735c /indra/llui/llfocusmgr.cpp
parent5c9d878d8c2da0d413aa6b0976faa595382681c2 (diff)
parent53bfc13ab8732633d8a53c2d3602aff3e3e652d2 (diff)
merge
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..43e5f6b051 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -315,6 +315,20 @@ void LLFocusMgr::removeKeyboardFocusWithoutCallback( const LLFocusableElement* f
}
}
+bool LLFocusMgr::keyboardFocusHasAccelerators() const
+{
+ LLView* focus_view = dynamic_cast<LLView*>(mKeyboardFocus);
+ while( focus_view )
+ {
+ if(focus_view->hasAccelerators())
+ {
+ return true;
+ }
+
+ focus_view = focus_view->getParent();
+ }
+ return false;
+}
void LLFocusMgr::setMouseCapture( LLMouseHandler* new_captor )
{