summaryrefslogtreecommitdiff
path: root/indra/newview/llgesturemgr.h
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-12-15 20:55:02 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-12-15 21:36:58 +0200
commit2800905ac354fec6316cf83da85eb5f4c6060741 (patch)
tree56ca4cb7d8de5ce698a164bb869812c16164c21a /indra/newview/llgesturemgr.h
parent6583fdf526c356b47122de3894b0fb68d83ae50b (diff)
parent0a873cd95547f003878c6d00d0883ff792f4a865 (diff)
Merge branch master (DRTVWR-552) into DRTVWR-542-meshopt
+resolved viewer-manager's inherited conflict
Diffstat (limited to 'indra/newview/llgesturemgr.h')
-rw-r--r--indra/newview/llgesturemgr.h11
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);