Merge branch 'main' into marchcat/x-mf-merge

# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterimagepreview.cpp

2 files changed, 23 insertions, 20 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();
diff --git a/indra/llcharacter/llmultigesture.h b/indra/llcharacter/llmultigesture.h
index acb0bc7cb2..bc9963f2b1 100644
--- a/indra/llcharacter/llmultigesture.h
+++ b/indra/llcharacter/llmultigesture.h
@@ -59,8 +59,8 @@ protected:
     const LLMultiGesture& operator=(const LLMultiGesture& rhs);
 
 public:
-    KEY mKey;
-    MASK mMask;
+    KEY mKey { 0 };
+    MASK mMask { 0 };
 
     // This name can be empty if the inventory item is not around and
     // the gesture manager has not yet set the name
@@ -75,25 +75,34 @@ public:
     std::vector<LLGestureStep*> mSteps;
 
     // Is the gesture currently playing?
-    BOOL mPlaying;
+    BOOL mPlaying { FALSE };
 
     // "instruction pointer" for steps
-    S32 mCurrentStep;
+    S32 mCurrentStep { 0 };
 
     // We're waiting for triggered animations to stop playing
-    BOOL mWaitingAnimations;
+    BOOL mWaitingAnimations { FALSE };
+
+    // We're waiting for key release
+    BOOL mWaitingKeyRelease { FALSE };
 
     // We're waiting a fixed amount of time
-    BOOL mWaitingTimer;
+    BOOL mWaitingTimer { FALSE };
+
+    // We're waiting for triggered animations to stop playing
+    BOOL mTriggeredByKey { FALSE };
+
+    // Has the key been released?
+    BOOL mKeyReleased { FALSE };
 
     // Waiting after the last step played for all animations to complete
-    BOOL mWaitingAtEnd;
+    BOOL mWaitingAtEnd { FALSE };
 
     // Timer for waiting
     LLFrameTimer mWaitTimer;
 
-    void (*mDoneCallback)(LLMultiGesture* gesture, void* data);
-    void* mCallbackData;
+    void (*mDoneCallback)(LLMultiGesture* gesture, void* data) { NULL };
+    void* mCallbackData { NULL };
 
     // Animations that we requested to start
     std::set<LLUUID> mRequestedAnimIDs;
@@ -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
 {