diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2015-12-22 11:07:18 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2015-12-22 11:07:18 +0200 |
| commit | 60dfd55edaa5df0cb864dc5086037bc5625bc0be (patch) | |
| tree | 7140d0f8eddc02e7ee71fa03fc9aa4aa652cd476 /indra/newview/llviewerkeyboard.cpp | |
| parent | 6e6d610a9905c1bceb9dd073c3eed87574fdcb29 (diff) | |
| parent | 7b993d15b70d419dc0a7c8d92286d34a2635537d (diff) | |
Merge downstream, version 4.0.1
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
| -rwxr-xr-x | indra/newview/llviewerkeyboard.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index f36d602ae5..2186ed3c52 100755 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -729,7 +729,10 @@ BOOL LLViewerKeyboard::handleKey(KEY translated_key, MASK translated_mask, BOOL return mKeyHandledByUI[translated_key]; } - +BOOL LLViewerKeyboard::handleKeyUp(KEY translated_key, MASK translated_mask) +{ + return gViewerWindow->handleKeyUp(translated_key, translated_mask); +} BOOL LLViewerKeyboard::bindKey(const S32 mode, const KEY key, const MASK mask, const std::string& function_name) { |