diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 00:17:42 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 00:17:42 -0800 |
commit | 0bf246ed663ad11d316fe7898a3fee3f57676d4b (patch) | |
tree | 20476d64aecbb1b644ea1f307264c222b7d2e6f6 /indra/newview/llgesturemgr.cpp | |
parent | c2ca71322bf48653d466cba40bbe01c3401318c7 (diff) | |
parent | 109b79e9ad67b5fa8967442a47ef15e456eb5bff (diff) |
Automated merge
Diffstat (limited to 'indra/newview/llgesturemgr.cpp')
-rw-r--r-- | indra/newview/llgesturemgr.cpp | 10 |
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); |