diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-01-14 17:42:21 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-01-14 17:42:21 +0200 |
| commit | eb800ade7eb27038823e12f667901ea32c14160d (patch) | |
| tree | 809577184c70d83a551bf0beb101a685a7ac4400 /indra/newview/llgesturemgr.cpp | |
| parent | b91a3967a44cbae619775922a57e100db7235385 (diff) | |
At last! Implemented normal task EXT-3477 (Change gesture list implementation).
Created a new widget consisting of button and scrollist. List is added to NonSideTrayView
to properly draw it without using topcontrol (because it caused problems).
This commit also fixes following bugs:
EXT-3301 (Opening Gestures on Bottom Tray Disables Move Button)
EXT-3190 (No bottom tray's context menu appears if right mouse click was perform over enabled Gesture button)
EXT-2610 ('Gesture' btn: floater opens on OnMouseDown)
--HG--
branch : product-engine
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); |