From 02ca44eea58b3311f5879309c1e310e893a41b1e Mon Sep 17 00:00:00 2001
From: Kyler Eastridge <felix.wolfz@gmail.com>
Date: Sat, 7 Oct 2023 16:54:30 -0400
Subject: [BUG-234493] Add "Until key release" to the gesture "Wait"

---
 indra/llcharacter/llmultigesture.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llcharacter/llmultigesture.cpp')

diff --git a/indra/llcharacter/llmultigesture.cpp b/indra/llcharacter/llmultigesture.cpp
index 7ed242f90a..511d931569 100644
--- a/indra/llcharacter/llmultigesture.cpp
+++ b/indra/llcharacter/llmultigesture.cpp
@@ -68,6 +68,8 @@ void LLMultiGesture::reset()
 	mCurrentStep = 0;
 	mWaitTimer.reset();
 	mWaitingTimer = FALSE;
+	mTriggeredByKey = FALSE;
+	mKeyReleased = FALSE;
 	mWaitingAnimations = FALSE;
 	mWaitingAtEnd = FALSE;
 	mRequestedAnimIDs.clear();
-- 
cgit v1.2.3


From 110eb2c989b6655796c15a657d0898375027f3f2 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 23 Nov 2023 22:04:49 +0100
Subject: SL-20442 Add an 'Until shortcut key released' option to gestures so
 we can do properly user-mappable keys

---
 indra/llcharacter/llmultigesture.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'indra/llcharacter/llmultigesture.cpp')

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();
-- 
cgit v1.2.3