diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-03-09 14:26:24 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-03-09 14:26:24 -0800 |
| commit | 519cbcecdf78e4dfc3adc465ae8cebed5df71647 (patch) | |
| tree | efa8e20856dbfc80e1ae44283cbd0139b828b1b2 /indra/llmessage/llxfer_vfile.h | |
| parent | ada8ad1bc21665631f030c3194a567ea6f6a2a72 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge with master before reseting to revert (revert) and get back to D519 status
Diffstat (limited to 'indra/llmessage/llxfer_vfile.h')
| -rw-r--r-- | indra/llmessage/llxfer_vfile.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/llmessage/llxfer_vfile.h b/indra/llmessage/llxfer_vfile.h index d82bab5f6c..5bf9a5cfba 100644 --- a/indra/llmessage/llxfer_vfile.h +++ b/indra/llmessage/llxfer_vfile.h @@ -30,7 +30,8 @@ #include "llxfer.h" #include "llassetstorage.h" -class LLFileSystem; +class LLVFS; +class LLVFile; class LLXfer_VFile : public LLXfer { @@ -40,7 +41,9 @@ class LLXfer_VFile : public LLXfer LLUUID mTempID; LLAssetType::EType mType; - LLFileSystem *mVFile; + LLVFile *mVFile; + + LLVFS *mVFS; std::string mName; @@ -48,13 +51,14 @@ class LLXfer_VFile : public LLXfer public: LLXfer_VFile (); - LLXfer_VFile (const LLUUID &local_id, LLAssetType::EType type); + LLXfer_VFile (LLVFS *vfs, const LLUUID &local_id, LLAssetType::EType type); virtual ~LLXfer_VFile(); - virtual void init(const LLUUID &local_id, LLAssetType::EType type); + virtual void init(LLVFS *vfs, const LLUUID &local_id, LLAssetType::EType type); virtual void cleanup(); virtual S32 initializeRequest(U64 xfer_id, + LLVFS *vfs, const LLUUID &local_id, const LLUUID &remote_id, const LLAssetType::EType type, |