diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-06-08 14:53:00 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-06-08 14:53:00 -0700 |
| commit | 484a4733b7b361d87c6092f4f399951e84c2aacd (patch) | |
| tree | 3031f4f041ffbe87f57d3a58e8ecf3bc988f439b /indra/newview/llgesturemgr.h | |
| parent | 3dfb4944ed916f9a251078a2614a854b9de0315d (diff) | |
| parent | 68a7c4cb83aca58e6ad9162be9e5022d6f801eac (diff) | |
Merge latest from lindenlab/viewer-development/
Diffstat (limited to 'indra/newview/llgesturemgr.h')
| -rw-r--r-- | indra/newview/llgesturemgr.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h index 5930841cbc..26a5924ec3 100644 --- a/indra/newview/llgesturemgr.h +++ b/indra/newview/llgesturemgr.h @@ -37,6 +37,7 @@ #include "llviewerinventory.h" class LLMultiGesture; +class LLGestureListener; class LLGestureStep; class LLUUID; class LLVFS; @@ -154,9 +155,9 @@ protected: // Used by loadGesture static void onLoadComplete(LLVFS *vfs, - const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status); + const LLUUID& asset_uuid, + LLAssetType::EType type, + void* user_data, S32 status, LLExtStat ext_status); // Used by playGesture to load an asset file // required to play a gesture step @@ -185,6 +186,9 @@ private: BOOL mValid; std::set<LLUUID> mLoadingAssets; + + // LLEventHost interface + boost::shared_ptr<LLGestureListener> mListener; }; #endif |