diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2019-09-24 14:35:26 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2019-09-24 14:35:26 -0400 |
commit | 77621dd3fc99f4fb1285a929e0b56b019f6b65c2 (patch) | |
tree | 4de95909b29874f492206b090b2e233b8acb596c /indra/newview/llviewerkeyboard.cpp | |
parent | 8053bceaa0ccd6128536375c21cc3e9e19429efa (diff) | |
parent | e241670694959833feaa0e667222b337095eb683 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vs2017
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
-rw-r--r-- | indra/newview/llviewerkeyboard.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index b89e1497a1..e930eb20d3 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -64,7 +64,12 @@ LLViewerKeyboard gViewerKeyboard; void agent_jump( EKeystate s ) { - if( KEYSTATE_UP == s ) return; + static BOOL first_fly_attempt(TRUE); + if (KEYSTATE_UP == s) + { + first_fly_attempt = TRUE; + return; + } F32 time = gKeyboard->getCurKeyElapsedTime(); S32 frame_count = ll_round(gKeyboard->getCurKeyElapsedFrameCount()); @@ -77,7 +82,8 @@ void agent_jump( EKeystate s ) } else { - gAgent.setFlying(TRUE); + gAgent.setFlying(TRUE, first_fly_attempt); + first_fly_attempt = FALSE; gAgent.moveUp(1); } } |