diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2011-06-01 15:44:46 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2011-06-01 15:44:46 -0700 |
commit | 926a9dcb58106650e8efda7a8a32b58bb6fcbd9e (patch) | |
tree | 6d569bbcee6f8448f3307149e4394e9dee9b20b8 /indra/newview/llgesturemgr.h | |
parent | fe9eccdbae9af3c61bff4637c1a61cdc09068a32 (diff) | |
parent | 5093f604cb04e8de54750498fd7fa01538f4b22c (diff) |
merge
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 |