diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-12-18 14:10:02 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-12-18 14:10:02 -0800 |
| commit | 909e4097433ab8e84a19e2119a9ecf05b3eebe64 (patch) | |
| tree | fe11439e42d20f1f2eae81e772c68b0d9fdb2692 /indra/newview/llviewerkeyboard.cpp | |
| parent | b98469bd7db06973e6058118551e500dc094d3c0 (diff) | |
| parent | 6dd80980cfa5be214c143d125cfabd006ea7ebff (diff) | |
Merge
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 ada829eb4b..1ab672aafc 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) { |