summaryrefslogtreecommitdiff
path: root/indra/newview/llgesturemgr.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-01-14 19:45:12 -0500
committerLoren Shih <seraph@lindenlab.com>2010-01-14 19:45:12 -0500
commit056d2a82698406641e4930f7adf2fe31664c9266 (patch)
treeddc678144c67e5467d07c2aebe4740cde6901630 /indra/newview/llgesturemgr.cpp
parent04f1a83b2e0517fb9f3730a31941d79adf603059 (diff)
parente7b69ec8f8a69a437f821fb1c6b6ebeea80e28cc (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llgesturemgr.cpp')
-rw-r--r--indra/newview/llgesturemgr.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
index df7aa9eabf..82293b4aa0 100644
--- a/indra/newview/llgesturemgr.cpp
+++ b/indra/newview/llgesturemgr.cpp
@@ -417,6 +417,16 @@ BOOL LLGestureManager::isGesturePlaying(const LLUUID& item_id)
return gesture->mPlaying;
}
+BOOL LLGestureManager::isGesturePlaying(LLMultiGesture* gesture)
+{
+ if(!gesture)
+ {
+ return FALSE;
+ }
+
+ return gesture->mPlaying;
+}
+
void LLGestureManager::replaceGesture(const LLUUID& item_id, LLMultiGesture* new_gesture, const LLUUID& asset_id)
{
const LLUUID& base_item_id = get_linked_uuid(item_id);