diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-23 19:41:44 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-23 19:41:44 -0500 |
| commit | 5a4bb72b8d37ca51deb84e1490fdefe2908d2d59 (patch) | |
| tree | 9a22b0583bb290a242df3c619665fdb692e1ecef /indra/llui/lluictrl.cpp | |
| parent | 86380bb177b9e18e345bc302efb3a84b2c5758a9 (diff) | |
| parent | 49de8add8355455da4b6ec5aaa55427fafa94322 (diff) | |
Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export
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()) { |