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/llxfer_vfile.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/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, |