diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-10-11 10:40:05 -0700 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-10-11 10:40:05 -0700 |
| commit | 92a8d93b0d3084c1ccd4fb9cccc285bc14d01404 (patch) | |
| tree | a07a9cba41f8609a6cfc6449877ca5c2d6ddfdd9 /indra/llui/llfocusmgr.cpp | |
| parent | c2f5bc0b129e0e0d2606a8e7849bbf37eb0276ea (diff) | |
| parent | 48c2b2496d3ed6aeeebb0bc8950725f8ef7e305f (diff) | |
Another merge from http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llui/llfocusmgr.cpp')
| -rw-r--r-- | indra/llui/llfocusmgr.cpp | 14 |
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 ) { |