Merge branch 'develop' into maxim/lua-nearby-avatars

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/llwindow/llkeyboardwin32.cpp b/indra/llwindow/llkeyboardwin32.cpp
index 8d6b8d9b93..c31ef5c9a3 100644
--- a/indra/llwindow/llkeyboardwin32.cpp
+++ b/indra/llwindow/llkeyboardwin32.cpp
@@ -182,7 +182,7 @@ void LLKeyboardWin32::resetMaskKeys()
 //}
 
 
-MASK LLKeyboardWin32::updateModifiers()
+MASK LLKeyboardWin32::updateModifiers(const U32 mask)
 {
     //RN: this seems redundant, as we should have already received the appropriate
     // messages for the modifier keys
@@ -191,8 +191,7 @@ MASK LLKeyboardWin32::updateModifiers()
     // (keydown encoded in high order bit of short)
     mKeyLevel[KEY_CAPSLOCK] = (GetKeyState(VK_CAPITAL) & 0x0001) != 0; // Low order bit carries the toggle state.
     // Get mask for keyboard events
-    MASK mask = currentMask(false);
-    return mask;
+    return currentMask(false);
 }
 
 
@@ -203,7 +202,7 @@ bool LLKeyboardWin32::handleKeyDown(const U16 key, MASK mask)
     U32     translated_mask;
     bool    handled = false;
 
-    translated_mask = updateModifiers();
+    translated_mask = updateModifiers(mask);
 
     if (translateExtendedKey(key, mask, &translated_key))
     {
@@ -220,7 +219,7 @@ bool LLKeyboardWin32::handleKeyUp(const U16 key, MASK mask)
     U32     translated_mask;
     bool    handled = false;
 
-    translated_mask = updateModifiers();
+    translated_mask = updateModifiers(mask);
 
     if (translateExtendedKey(key, mask, &translated_key))
     {
@@ -259,6 +258,7 @@ void LLKeyboardWin32::scanKeyboard()
             mCallbacks->handleScanKey(key, mKeyDown[key], mKeyUp[key], mKeyLevel[key]);
         }
     }
+    mCurScanKey = KEY_NONE;
 
     // Reset edges for next frame
     for (key = 0; key < KEY_COUNT; key++)
@@ -321,4 +321,4 @@ U16  LLKeyboardWin32::inverseTranslateExtendedKey(const KEY translated_key)
     return inverseTranslateKey(converted_key);
 }
 
-#endif
+#endif // LL_WINDOWS