diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-23 01:04:01 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-23 01:04:01 +0000 |
| commit | 39018947081772bf7226d757c647520c54b18fd2 (patch) | |
| tree | 74b00b3006878d7e576b84cb3240d98c22d67db9 /indra/newview/llviewerkeyboard.cpp | |
| parent | c01edec021194bacb86dc9a3f5a3cc655a8cb15f (diff) | |
QAR-488 Viewer 1.20 RC 2
merge Branch_1-20-Viewer -r 84760 : 85100 -> release
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
| -rw-r--r-- | indra/newview/llviewerkeyboard.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index b885e4e6b9..bea4b910b6 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -31,6 +31,7 @@ #include "llviewerprecompiledheaders.h" +#include "llappviewer.h" #include "llviewerkeyboard.h" #include "llmath.h" #include "llagent.h" @@ -99,7 +100,8 @@ static void agent_handle_doubletap_run(EKeystate s, LLAgent::EDoubleTapRunMode m } gAgent.mDoubleTapRunMode = mode; } - else if (KEYSTATE_DOWN == s && + else if (gAllowTapTapHoldRun && + KEYSTATE_DOWN == s && gAgent.mDoubleTapRunMode == mode && gAgent.mDoubleTapRunTimer.getElapsedTimeF32() < NUDGE_TIME) { |