diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:41:04 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:41:04 +0200 |
| commit | 367be4d1888dd0b60100350b2190bbee93d5ac9e (patch) | |
| tree | 8d8d0e9fa123b0f6714a683e4d77cc3be116a38d /indra/newview/llgesturemgr.h | |
| parent | 06765bd664c1fd24566c118db1c8393dc8d698d3 (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) | |
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/newview/llgesturemgr.h')
| -rw-r--r-- | indra/newview/llgesturemgr.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h index 402bdf6039..91ab445273 100644 --- a/indra/newview/llgesturemgr.h +++ b/indra/newview/llgesturemgr.h @@ -40,7 +40,6 @@ class LLMultiGesture; class LLGestureListener; class LLGestureStep; class LLUUID; -class LLVFS; class LLGestureManagerObserver { @@ -154,15 +153,13 @@ protected: void done(); // Used by loadGesture - static void onLoadComplete(LLVFS *vfs, - const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status); + static void onLoadComplete(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 - static void onAssetLoadComplete(LLVFS *vfs, - const LLUUID& asset_uuid, + static void onAssetLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); |