diff options
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llkeyboard.cpp | 16 | ||||
| -rw-r--r-- | indra/llwindow/llkeyboard.h | 3 | 
2 files changed, 18 insertions, 1 deletions
| diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp index 5404ac50e5..e65cc7563e 100644 --- a/indra/llwindow/llkeyboard.cpp +++ b/indra/llwindow/llkeyboard.cpp @@ -148,6 +148,22 @@ void LLKeyboard::addKeyName(KEY key, const std::string& name)  	sNamesToKeys[nameuc] = key;  } +void LLKeyboard::resetKeyDownAndHandle() +{ +    MASK mask = currentMask(FALSE); +    for (S32 i = 0; i < KEY_COUNT; i++) +    { +        if (mKeyLevel[i]) +        { +            mKeyDown[i] = FALSE; +            mKeyLevel[i] = FALSE; +            mKeyUp[i] = TRUE; +            mCurTranslatedKey = (KEY)i; +            mCallbacks->handleTranslatedKeyUp(i, mask); +        } +    } +} +  // BUG this has to be called when an OS dialog is shown, otherwise modifier key state  // is wrong because the keyup event is never received by the main window. JC  void LLKeyboard::resetKeys() diff --git a/indra/llwindow/llkeyboard.h b/indra/llwindow/llkeyboard.h index 36bd8bcbed..fb1ae10f50 100644 --- a/indra/llwindow/llkeyboard.h +++ b/indra/llwindow/llkeyboard.h @@ -58,7 +58,8 @@ public:  	LLKeyboard();  	virtual ~LLKeyboard(); -	void			resetKeys(); +    void			resetKeyDownAndHandle(); +    void			resetKeys();  	F32				getCurKeyElapsedTime()	{ return getKeyDown(mCurScanKey) ? getKeyElapsedTime( mCurScanKey ) : 0.f; } | 
