summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcorehttputil.cpp
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2021-12-15 14:37:18 -0700
committerDave Houlton <euclid@lindenlab.com>2021-12-15 14:37:18 -0700
commitcf35d27dfb86a8a8d8223bc344f35984efaa7b98 (patch)
tree883758ee1282e0936343ec27d80d25329aae9242 /indra/llmessage/llcorehttputil.cpp
parent199775b7ac214cfc3492c343c3f6046effcde7ed (diff)
parent0a873cd95547f003878c6d00d0883ff792f4a865 (diff)
DRTVWR-546 merge up to 6.5.2
Diffstat (limited to 'indra/llmessage/llcorehttputil.cpp')
-rw-r--r--indra/llmessage/llcorehttputil.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llcorehttputil.cpp b/indra/llmessage/llcorehttputil.cpp
index 0eae6d9826..7031f1aa8c 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 "llvfile.h"
+#include "llfilesystem.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());
- LLVFile vfile(gVFS, assetId, assetType, LLVFile::READ);
+ LLFileSystem vfile(assetId, assetType, LLFileSystem::READ);
S32 fileSize = vfile.getSize();
U8* fileBuffer;