diff options
| author | Richard Linden <none@none> | 2010-12-10 14:48:24 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-12-10 14:48:24 -0800 |
| commit | 524fd399bbc208049762654676883a4a34c8c602 (patch) | |
| tree | 7b9164c583fbb9fbc0bbf09bc22e86426b077e25 /indra/llui/lluictrl.cpp | |
| parent | 5f01d6a6861fdcd4c9c09e60a631ed92d2b15a82 (diff) | |
| parent | 8044661bd581fd7b6a25bd04d4c4f7e32e421faf (diff) | |
merge
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 3ac3bf8c41..d81f425cce 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -823,7 +823,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()) { |