Merge branch 'main' into release/luau-scripting for Maint X release.

1 files changed, 9 insertions, 2 deletions

diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h
index 73b898c406..b41f0ee106 100644
--- a/indra/newview/llgesturemgr.h
+++ b/indra/newview/llgesturemgr.h
@@ -102,7 +102,10 @@ public:
     const item_map_t& getActiveGestures() const { return mActive; }
     // Force a gesture to be played, for example, if it is being
     // previewed.
-    void playGesture(LLMultiGesture* gesture);
+    void playGesture(LLMultiGesture* gesture, bool fromKeyPress);
+    void playGesture(LLMultiGesture* gesture) {
+        playGesture(gesture, FALSE);
+    }
     void playGesture(const LLUUID& item_id);
 
     // Stop all requested or playing anims for this gesture
@@ -118,10 +121,14 @@ public:
     {
         mCallbackMap[inv_item_id] = cb;
     }
-    // Trigger the first gesture that matches this key.
+    // Trigger a random gesture that matches this key.
     // Returns TRUE if it finds a gesture bound to that key.
     BOOL triggerGesture(KEY key, MASK mask);
 
+    // Trigger release wait on all gestures that matches this key.
+    // Returns TRUE if it finds a gesture bound to that key.
+    BOOL triggerGestureRelease(KEY key, MASK mask);
+
     // Trigger all gestures referenced as substrings in this string
     BOOL triggerAndReviseString(const std::string &str, std::string *revised_string = NULL);