diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:35:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:35:41 -0400 |
| commit | cb957d3dabfd0a419cb70461cc5bf3af2adba7a3 (patch) | |
| tree | ac9978539aa02d80bf8c026aa3b2e1ba85404ecf /indra/llui/llview.cpp | |
| parent | 7819b49086729187e198bf69f9c45f1c63f11ff2 (diff) | |
| parent | b8320207bb911a311a498426fdd4a987dd7748ea (diff) | |
merge late 3.0.1 beta candidate fixes
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 8803d106ba..659a54cc6e 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1655,15 +1655,19 @@ BOOL LLView::hasAncestor(const LLView* parentp) const BOOL LLView::childHasKeyboardFocus( const std::string& childname ) const { - LLView *child = findChildView(childname, TRUE); - if (child) - { - return gFocusMgr.childHasKeyboardFocus(child); - } - else + LLView *focus = dynamic_cast<LLView *>(gFocusMgr.getKeyboardFocus()); + + while (focus != NULL) { - return FALSE; + if (focus->getName() == childname) + { + return TRUE; + } + + focus = focus->getParent(); } + + return FALSE; } //----------------------------------------------------------------------------- |