diff options
| -rw-r--r-- | indra/llui/llpanel.cpp | 10 | 
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); +			}  		}  	} | 
