summaryrefslogtreecommitdiff
path: root/indra/newview/llgesturemgr.h
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2010-01-14 17:42:21 +0200
committerAndrew Dyukov <adyukov@productengine.com>2010-01-14 17:42:21 +0200
commiteb800ade7eb27038823e12f667901ea32c14160d (patch)
tree809577184c70d83a551bf0beb101a685a7ac4400 /indra/newview/llgesturemgr.h
parentb91a3967a44cbae619775922a57e100db7235385 (diff)
At last! Implemented normal task EXT-3477 (Change gesture list implementation).
Created a new widget consisting of button and scrollist. List is added to NonSideTrayView to properly draw it without using topcontrol (because it caused problems). This commit also fixes following bugs: EXT-3301 (Opening Gestures on Bottom Tray Disables Move Button) EXT-3190 (No bottom tray's context menu appears if right mouse click was perform over enabled Gesture button) EXT-2610 ('Gesture' btn: floater opens on OnMouseDown) --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llgesturemgr.h')
-rw-r--r--indra/newview/llgesturemgr.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h
index e80eea9ae9..c562587c6f 100644
--- a/indra/newview/llgesturemgr.h
+++ b/indra/newview/llgesturemgr.h
@@ -103,6 +103,8 @@ public:
BOOL isGesturePlaying(const LLUUID& item_id);
+ BOOL isGesturePlaying(LLMultiGesture* gesture);
+
const item_map_t& getActiveGestures() const { return mActive; }
// Force a gesture to be played, for example, if it is being
// previewed.