diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-12-18 10:44:42 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-12-18 10:44:42 -0500 |
| commit | 4b7ff25eba4b285e267ec6f766221ffcde82a808 (patch) | |
| tree | e8a885c7167046bec9311981a7f690a190248b2a /indra/newview/llviewerkeyboard.cpp | |
| parent | d3b4f34eb7ff80315f1d714aa50bc7d7d33f9855 (diff) | |
| parent | 7b993d15b70d419dc0a7c8d92286d34a2635537d (diff) | |
merge changes for 4.0.0-release
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) { |