summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-04-03 01:11:17 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-04-03 01:11:17 +0000
commitb3fcfa16ba8b984163c38904e165052a34be6dab (patch)
tree517c838f4f7e0c77e89c08ae267e82850f3ef9c0 /indra
parent941cb9f4124c9ccfd5c845bc94639fa46df12c3d (diff)
DEV-13060 - Crash when pressing TAB in quick search window.
Reviewed by coco
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/llpanel.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index c3afa040f8..fa48ebebe9 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -293,7 +293,10 @@ BOOL LLPanel::handleKeyHere( KEY key, MASK mask )
if (cur_focus)
{
LLUICtrl* focus_root = cur_focus->findRootMostFocusRoot();
- handled = focus_root->focusPrevItem(FALSE);
+ if (focus_root)
+ {
+ handled = focus_root->focusPrevItem(FALSE);
+ }
}
}
else if( (mask == MASK_NONE ) && (KEY_TAB == key))
@@ -302,7 +305,10 @@ BOOL LLPanel::handleKeyHere( KEY key, MASK mask )
if (cur_focus)
{
LLUICtrl* focus_root = cur_focus->findRootMostFocusRoot();
- handled = focus_root->focusNextItem(FALSE);
+ if (focus_root)
+ {
+ handled = focus_root->focusNextItem(FALSE);
+ }
}
}