diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-03-08 13:56:16 +0000 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-03-08 13:56:16 +0000 |
commit | c83e740ef94e16ba85574454f3138905edecb029 (patch) | |
tree | 6e10779ff7b2df5194a3df9d100ba28d53883166 /indra/llmessage/lltransfersourceasset.h | |
parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) |
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing
changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
Diffstat (limited to 'indra/llmessage/lltransfersourceasset.h')
-rw-r--r-- | indra/llmessage/lltransfersourceasset.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/lltransfersourceasset.h b/indra/llmessage/lltransfersourceasset.h index 585e683cb3..3abda83cf8 100644 --- a/indra/llmessage/lltransfersourceasset.h +++ b/indra/llmessage/lltransfersourceasset.h @@ -30,7 +30,7 @@ #include "lltransfermanager.h" #include "llassetstorage.h" -class LLFileSystem; +class LLVFile; class LLTransferSourceParamsAsset : public LLTransferSourceParams { @@ -56,7 +56,7 @@ public: LLTransferSourceAsset(const LLUUID &request_id, const F32 priority); virtual ~LLTransferSourceAsset(); - static void responderCallback(const LLUUID& uuid, LLAssetType::EType type, + static void responderCallback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type, void *user_data, S32 result, LLExtStat ext_status ); protected: /*virtual*/ void initTransfer(); |