diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-24 15:48:28 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-24 15:48:28 -0500 |
| commit | 905431cf60c5670b6b069f0881778ada6ceaa035 (patch) | |
| tree | 59cc1d383cc9025a499cae686bc5786992d7febe /indra/newview/llviewermedia.cpp | |
| parent | a91482f0afa38c39a027f5b54bca652147917f2a (diff) | |
| parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) | |
merge changes for 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; } |