diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 22:00:01 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 22:00:01 +0200 |
| commit | 8d5f5b4ced5fae8b50655064262a21ac3787c372 (patch) | |
| tree | c53093da383ede4fbe7df2bb5f92d239df15a855 /indra/llmessage/lltransfersourceasset.cpp | |
| parent | 9ba43b5ce9c480ab84adabdf85536c9c14186c05 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' into DRTVWR-521-maint
Diffstat (limited to 'indra/llmessage/lltransfersourceasset.cpp')
| -rw-r--r-- | indra/llmessage/lltransfersourceasset.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llmessage/lltransfersourceasset.cpp b/indra/llmessage/lltransfersourceasset.cpp index 027283232d..80ed3340c6 100644 --- a/indra/llmessage/lltransfersourceasset.cpp +++ b/indra/llmessage/lltransfersourceasset.cpp @@ -32,7 +32,7 @@ #include "message.h" #include "lldatapacker.h" #include "lldir.h" -#include "llfilesystem.h" +#include "llvfile.h" LLTransferSourceAsset::LLTransferSourceAsset(const LLUUID &request_id, const F32 priority) : LLTransferSource(LLTST_ASSET, request_id, priority), @@ -99,7 +99,7 @@ LLTSCode LLTransferSourceAsset::dataCallback(const S32 packet_id, return LLTS_SKIP; } - LLFileSystem vf(mParams.getAssetID(), mParams.getAssetType(), LLFileSystem::READ); + LLVFile vf(gAssetStorage->mVFS, mParams.getAssetID(), mParams.getAssetType(), LLVFile::READ); if (!vf.getSize()) { @@ -171,7 +171,7 @@ BOOL LLTransferSourceAsset::unpackParams(LLDataPacker &dp) } -void LLTransferSourceAsset::responderCallback(const LLUUID& uuid, LLAssetType::EType type, +void LLTransferSourceAsset::responderCallback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type, void *user_data, S32 result, LLExtStat ext_status ) { LLUUID *tidp = ((LLUUID*) user_data); @@ -198,7 +198,7 @@ void LLTransferSourceAsset::responderCallback(const LLUUID& uuid, LLAssetType::E if (LL_ERR_NOERR == result) { // Everything's OK. - LLFileSystem vf(uuid, type, LLFileSystem::READ); + LLVFile vf(gAssetStorage->mVFS, uuid, type, LLVFile::READ); tsap->mSize = vf.getSize(); status = LLTS_OK; } |