diff options
| author | skolb <none@none> | 2009-10-15 13:58:16 -0700 |
|---|---|---|
| committer | skolb <none@none> | 2009-10-15 13:58:16 -0700 |
| commit | e9f7205ba9f4dfb3422759218609b62d61972722 (patch) | |
| tree | e7859943f67b0ab2f8e132cd64c0effbb3462206 /indra/newview/llviewermediafocus.cpp | |
| parent | 1b1550f284316b244a10a4a6604fedb5d6b18965 (diff) | |
| parent | 050ae3cf5107140a58f6aeae865d254b74a23d44 (diff) | |
Merge fix for DEV-39832
Diffstat (limited to 'indra/newview/llviewermediafocus.cpp')
| -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; } |