diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-13 12:21:53 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-13 12:21:53 -0800 |
commit | b964f3bccaf744ec719e7dff132a77801a419f2b (patch) | |
tree | f5f09ad1904cbf87878d5f6e9f34acbdb64975e2 /indra/newview/llfloatergesture.h | |
parent | ce397569bf40b5fe6e80eb0e302bf47b709f3e54 (diff) | |
parent | b3b608b2a8e0678a86c86f3506d6424d4834be20 (diff) |
Merge from product-engine
Diffstat (limited to 'indra/newview/llfloatergesture.h')
-rw-r--r-- | indra/newview/llfloatergesture.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llfloatergesture.h b/indra/newview/llfloatergesture.h index 9c1ab27cb0..9d047bf1cf 100644 --- a/indra/newview/llfloatergesture.h +++ b/indra/newview/llfloatergesture.h @@ -38,7 +38,7 @@ #define LL_LLFLOATERGESTURE_H #include "llfloater.h" - +#include "llinventorymodel.h" #include "lldarray.h" class LLScrollContainer; @@ -51,31 +51,35 @@ class LLGestureOptions; class LLScrollListCtrl; class LLFloaterGestureObserver; class LLFloaterGestureInventoryObserver; +class LLMultiGesture; class LLFloaterGesture -: public LLFloater +: public LLFloater, LLInventoryFetchDescendentsObserver { + LOG_CLASS(LLFloaterGesture); public: LLFloaterGesture(const LLSD& key); virtual ~LLFloaterGesture(); virtual BOOL postBuild(); - + virtual void done (); void refreshAll(); protected: // Reads from the gesture manager's list of active gestures // and puts them in this list. void buildGestureList(); - + void addGesture(const LLUUID& item_id, LLMultiGesture* gesture, LLCtrlListInterface * list); void onClickInventory(); void onClickEdit(); void onClickPlay(); void onClickNew(); void onCommitList(); + void playGesture(LLUUID item_id); protected: LLUUID mSelectedID; + LLUUID mGestureFolderID; LLFloaterGestureObserver* mObserver; }; |