diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 16:17:09 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 16:17:09 -0400 |
| commit | 2e144ecbb2cc7676cfb9f5ab46a2f63c8af85d85 (patch) | |
| tree | 0296876c167d0bec11434394157b4a5b1c0b63a5 /indra/llcharacter/llmultigesture.cpp | |
| parent | 1b5f0590ce45ce6e540d266a8902af5839885cfb (diff) | |
| parent | 33ad8db77584c66496f261a1cfd9aa535462a003 (diff) | |
Merge branch 'main' into nat/releaseos following Maint X promotion
Diffstat (limited to 'indra/llcharacter/llmultigesture.cpp')
| -rw-r--r-- | indra/llcharacter/llmultigesture.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/indra/llcharacter/llmultigesture.cpp b/indra/llcharacter/llmultigesture.cpp index cb153ba827..e5ca051f82 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,8 +57,11 @@ void LLMultiGesture::reset() mPlaying = FALSE; mCurrentStep = 0; mWaitTimer.reset(); - mWaitingTimer = FALSE; mWaitingAnimations = FALSE; + mWaitingKeyRelease = FALSE; + mWaitingTimer = FALSE; + mTriggeredByKey = FALSE; + mKeyReleased = FALSE; mWaitingAtEnd = FALSE; mRequestedAnimIDs.clear(); mPlayingAnimIDs.clear(); |
