diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
| commit | 1034db639462d95e54e9bf9e4d63500b745bb0a2 (patch) | |
| tree | 68b010fb3f9f2c4b67e59187d125090b1c69d72f /indra/llui/lluictrl.cpp | |
| parent | 0eb491417e8479516b07cc9237242b60d36d10f5 (diff) | |
| parent | eb0b8ab3ea19617a52881191bab21bfedcc5696d (diff) | |
merge changes for storm-806
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()) { |