[BUG-234493] Add "Until key release" to the gesture "Wait"

2 files changed, 12 insertions, 0 deletions

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();
diff --git a/indra/llcharacter/llmultigesture.h b/indra/llcharacter/llmultigesture.h
index 92820159d4..1865ec089c 100644
--- a/indra/llcharacter/llmultigesture.h
+++ b/indra/llcharacter/llmultigesture.h
@@ -83,9 +83,18 @@ public:
 	// We're waiting for triggered animations to stop playing
 	BOOL mWaitingAnimations;
 
+	// We're waiting for key release
+	BOOL mWaitingKeyRelease;
+
 	// We're waiting a fixed amount of time
 	BOOL mWaitingTimer;
 
+	// We're waiting for triggered animations to stop playing
+	BOOL mTriggeredByKey;
+
+	// Has the key been released?
+	BOOL mKeyReleased;
+
 	// Waiting after the last step played for all animations to complete
 	BOOL mWaitingAtEnd;
 
@@ -210,6 +219,7 @@ public:
 
 const U32 WAIT_FLAG_TIME		= 0x01;
 const U32 WAIT_FLAG_ALL_ANIM	= 0x02;
+const U32 WAIT_FLAG_KEY_RELEASE	= 0x04;
 
 class LLGestureStepWait : public LLGestureStep
 {