diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-15 13:36:33 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-15 13:36:33 -0800 |
commit | e761ba064a2b5960efdfc94bb5baef85a7ec1a0a (patch) | |
tree | de9970a791adf551b9cfa65a0013118d33c77554 /indra/newview/llgesturemgr.cpp | |
parent | 56af8f1639a13adeb6f34e9988489aa5757a3184 (diff) | |
parent | 4c4c68a3408c85e49d365c31be93e006be612ab1 (diff) |
Merge for EXT-1874, EXT-3800, EXT-4133
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); |