diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:08:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:08:20 -0500 |
| commit | a9caa3151cea77b992c06c5a774d333ffd3016e1 (patch) | |
| tree | 330cee487295788c500bcd7096a125120a10ae75 /indra/llui/lluictrl.cpp | |
| parent | bdd07a7a648dc7e2c290d5aa837c22c20c4af31c (diff) | |
| parent | ef1c3aac889d118530994e878d83426d4fc2ca7c (diff) | |
merge fix for storm-411
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()) { |