diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-22 14:06:46 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-22 14:06:46 -0800 |
| commit | c86d6a7bbb7c0db7665b76cf52b12b90c6e98c6d (patch) | |
| tree | 1056d6dc941e2aed458b459901fbb448c6e40ef7 /indra/llui/lluictrl.cpp | |
| parent | ab100825bd0064dc64b9ef8bea1c70bc04090716 (diff) | |
| parent | 6182ded4e9b4ba076add7a840c535589d36ec283 (diff) | |
STORM-808 : merge webkit upgrade to Qt v4.7.1
Diffstat (limited to 'indra/llui/lluictrl.cpp')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index afd60cbb3e..0a06b5e74f 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -827,7 +827,7 @@ LLUICtrl* LLUICtrl::findRootMostFocusRoot() { LLUICtrl* focus_root = NULL; LLUICtrl* next_view = this; - while(next_view) + while(next_view && next_view->hasTabStop()) { if (next_view->isFocusRoot()) { |