diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:41:05 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:41:05 -0500 |
| commit | e4591a85182133811e327b579c558bb3db80d79e (patch) | |
| tree | 13c4847d919939c9b50386d1dfcbc5837201c60e /indra/llui/lluictrl.cpp | |
| parent | d420ca89b438ebfb15dd3be8f5ec427361dfddaa (diff) | |
| parent | 67ced403e624599f23020c8b8bd802947e602d31 (diff) | |
merge changes for storm-466
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()) { |