summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerkeyboard.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-12-18 10:16:26 -0800
committerRider Linden <rider@lindenlab.com>2015-12-18 10:16:26 -0800
commit6dd80980cfa5be214c143d125cfabd006ea7ebff (patch)
tree102a4d2c7cddeec35feaf18e71cfb8f598001868 /indra/newview/llviewerkeyboard.cpp
parent2af14639de9f575ac9a2766835206e5c6ffb46c8 (diff)
parent7b993d15b70d419dc0a7c8d92286d34a2635537d (diff)
Merge
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
-rwxr-xr-xindra/newview/llviewerkeyboard.cpp5
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)
{