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 | f726660430a23fc55ecbdc4bc247923e94eb807d (patch) | |
tree | 0e6a1e9df6ebef37e2f502fea56d8eaa6d77a7e7 /indra/llui | |
parent | bb8919c013b1c219d79e2a71b89c4a842058f7bf (diff) | |
parent | b091125a0e53bef47bd968be78b55150807595ed (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; } |