diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-13 14:07:19 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-13 14:07:19 -0700 |
| commit | d5c43669d504549966083ded67ee59ceaf8c4c26 (patch) | |
| tree | 5f831bbacb2b69b833458be7c8e15e308d7830f0 /indra/newview | |
| parent | 630e003347bf638455d35494af4c57c28474139c (diff) | |
DEV-388867, DEV-39246
Escape key cancels zoom, zoom in closer
I also refactored the code a little to be able to
experiment with more zoom levels.
Review #13
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermediafocus.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp index 1b1b7cedb1..db31714f16 100644 --- a/indra/newview/llviewermediafocus.cpp +++ b/indra/newview/llviewermediafocus.cpp @@ -290,6 +290,11 @@ BOOL LLViewerMediaFocus::handleKey(KEY key, MASK mask, BOOL called_from_parent) { if(mMediaImpl.notNull()) mMediaImpl->handleKeyHere(key, mask); + + if (key == KEY_ESCAPE && mMediaHUD.get()) + { + mMediaHUD.get()->close(); + } return true; } |