diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:59:14 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:59:14 +0200 |
| commit | 9a36df576313e98144deb95b28ed845c768c9960 (patch) | |
| tree | 41fb30d95a6b4a4e033b41179f1787666215c05e /indra/llmessage/llcorehttputil.cpp | |
| parent | f271ba32774bae67754cb2c8144549aed9301012 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' into DRTVWR-514-keymappings
Diffstat (limited to 'indra/llmessage/llcorehttputil.cpp')
| -rw-r--r-- | indra/llmessage/llcorehttputil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llcorehttputil.cpp b/indra/llmessage/llcorehttputil.cpp index 7031f1aa8c..0eae6d9826 100644 --- a/indra/llmessage/llcorehttputil.cpp +++ b/indra/llmessage/llcorehttputil.cpp @@ -37,7 +37,7 @@ #include "llsdserialize.h" #include "reader.h" // JSON #include "writer.h" // JSON -#include "llfilesystem.h" +#include "llvfile.h" #include "message.h" // for getting the port @@ -784,7 +784,7 @@ LLSD HttpCoroutineAdapter::postFileAndSuspend(LLCore::HttpRequest::ptr_t request // scoping for our streams so that they go away when we no longer need them. { LLCore::BufferArrayStream outs(fileData.get()); - LLFileSystem vfile(assetId, assetType, LLFileSystem::READ); + LLVFile vfile(gVFS, assetId, assetType, LLVFile::READ); S32 fileSize = vfile.getSize(); U8* fileBuffer; |