diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-12-05 16:25:10 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-12-05 16:25:10 +0200 |
| commit | d1e4c0a4bd2c483c9aaece7fe5c79dfc99c5ed63 (patch) | |
| tree | 8d86e5bd0f28e72bd1a55e57b7d90d8e281248f3 /indra/newview | |
| parent | b44e479893a1d000886a65bec5161f447e6a325a (diff) | |
| parent | 57337ffbbb78d5b7d2f5d4ef59eabe687eb2d3cd (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 28f6837679..df0921954c 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1404,7 +1404,12 @@ BOOL LLViewerWindow::handleTranslatedKeyDown(KEY key, MASK mask, BOOL repeated) { // Let the voice chat code check for its PTT key. Note that this never affects event processing. LLVoiceClient::getInstance()->keyDown(key, mask); - + + if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME) + { + gAgent.clearAFK(); + } + // *NOTE: We want to interpret KEY_RETURN later when it arrives as // a Unicode char, not as a keydown. Otherwise when client frame // rate is really low, hitting return sends your chat text before @@ -1418,13 +1423,7 @@ BOOL LLViewerWindow::handleTranslatedKeyDown(KEY key, MASK mask, BOOL repeated) return FALSE; } - BOOL handled = gViewerKeyboard.handleKey(key, mask, repeated); - if (!handled || (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)) - { - gAgent.clearAFK(); - } - - return handled; + return gViewerKeyboard.handleKey(key, mask, repeated); } BOOL LLViewerWindow::handleTranslatedKeyUp(KEY key, MASK mask) |