summaryrefslogtreecommitdiff
path: root/indra/newview/llgesturemgr.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-01-15 12:02:56 -0800
committerJames Cook <james@lindenlab.com>2010-01-15 12:02:56 -0800
commit4acf56d2a79a4f3bb555977aeaef21e15e26f684 (patch)
treeac0d8ff2225916323d9b942246edd458e04fd738 /indra/newview/llgesturemgr.cpp
parent3f83c05f7c71887825c907b0e148d81cd7de5324 (diff)
parentc9cf84913d306103da51dc83e5932ff3fb308d32 (diff)
Merge in viewer-2-0 changes
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);