diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-20 12:17:51 -0700 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-20 12:17:51 -0700 |
| commit | cbcd8cbdbcb5e7742f0acba47d0aeb91e4523c54 (patch) | |
| tree | 0e6a1e9df6ebef37e2f502fea56d8eaa6d77a7e7 /indra/llui | |
| parent | 834f2fa6a5b956c1cee508756979bad3c4a72277 (diff) | |
| parent | dd053785fae6ae784f9d74f1ae8dc7b155ee283f (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llflatlistview.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp index 70558f8eb8..8de44455de 100644 --- a/indra/llui/llflatlistview.cpp +++ b/indra/llui/llflatlistview.cpp @@ -669,6 +669,14 @@ BOOL LLFlatListView::handleKeyHere(KEY key, MASK mask) } break; } + case KEY_ESCAPE: + { + if (mask == MASK_NONE) + { + setFocus(FALSE); // pass focus to the game area (EXT-8357) + } + break; + } default: break; } |