summaryrefslogtreecommitdiff
path: root/indra/newview/llgesturemgr.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-14 14:44:43 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-14 14:44:43 -0800
commit1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (patch)
treea09d45e10d3b03c94256424ecd8f881e75551aae /indra/newview/llgesturemgr.h
parent04fe0399443cf4a5852e94cd3950ba1fd2d50562 (diff)
Backed out changeset f34a69c2af56
(this backs-out my backout, now that I'm happy the original merge works okay :))
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.