From d5c43669d504549966083ded67ee59ceaf8c4c26 Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Tue, 13 Oct 2009 14:07:19 -0700 Subject: 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 --- indra/newview/llviewermediafocus.cpp | 5 +++++ 1 file changed, 5 insertions(+) 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; } -- cgit v1.2.3