diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-27 09:03:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-27 09:03:04 -0500 |
| commit | 83851db09ab0fecbb6722826055a55844fd98ea6 (patch) | |
| tree | b3c73b1dec463e4d8a8a315f1d713a83e119d99b /indra/newview/llviewermedia.cpp | |
| parent | bdb42b4c716a374ab7a7b54a630ed5b5a481cdb2 (diff) | |
| parent | d4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff) | |
merge up to 3.7.25-release
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rwxr-xr-x | indra/newview/llviewermedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index a1451d770a..c758bbcc9e 100755 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2703,7 +2703,7 @@ bool LLViewerMediaImpl::handleKeyHere(KEY key, MASK mask) { // FIXME: THIS IS SO WRONG. // Menu keys should be handled by the menu system and not passed to UI elements, but this is how LLTextEditor and LLLineEditor do it... - if( MASK_CONTROL & mask ) + if( MASK_CONTROL & mask && key != KEY_LEFT && key != KEY_RIGHT && key != KEY_HOME && key != KEY_END) { result = true; } |