summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llmultigesture.cpp
diff options
context:
space:
mode:
authorAlexander Gavriliuk <alexandrgproductengine@lindenlab.com>2023-11-23 22:04:49 +0100
committerGuru <alexandrgproductengine@lindenlab.com>2023-11-24 17:41:23 +0100
commit110eb2c989b6655796c15a657d0898375027f3f2 (patch)
treeaba267b14f5a9735b585918e2df81a4fd77e182a /indra/llcharacter/llmultigesture.cpp
parent9bf5ad98e508690efd334806885b6d1666bee602 (diff)
SL-20442 Add an 'Until shortcut key released' option to gestures so we can do properly user-mappable keys
Diffstat (limited to 'indra/llcharacter/llmultigesture.cpp')
-rw-r--r--indra/llcharacter/llmultigesture.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/indra/llcharacter/llmultigesture.cpp b/indra/llcharacter/llmultigesture.cpp
index 511d931569..15cad4ea16 100644
--- a/indra/llcharacter/llmultigesture.cpp
+++ b/indra/llcharacter/llmultigesture.cpp
@@ -42,16 +42,6 @@ const S32 GESTURE_VERSION = 2;
// LLMultiGesture
//---------------------------------------------------------------------------
LLMultiGesture::LLMultiGesture()
-: mKey(),
- mMask(),
- mName(),
- mTrigger(),
- mReplaceText(),
- mSteps(),
- mPlaying(FALSE),
- mCurrentStep(0),
- mDoneCallback(NULL),
- mCallbackData(NULL)
{
reset();
}
@@ -67,10 +57,11 @@ void LLMultiGesture::reset()
mPlaying = FALSE;
mCurrentStep = 0;
mWaitTimer.reset();
+ mWaitingAnimations = FALSE;
+ mWaitingKeyRelease = FALSE;
mWaitingTimer = FALSE;
mTriggeredByKey = FALSE;
mKeyReleased = FALSE;
- mWaitingAnimations = FALSE;
mWaitingAtEnd = FALSE;
mRequestedAnimIDs.clear();
mPlayingAnimIDs.clear();