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/newview/lllandmarklist.cpp | |
| parent | ada8ad1bc21665631f030c3194a567ea6f6a2a72 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge with master before reseting to revert (revert) and get back to D519 status
Diffstat (limited to 'indra/newview/lllandmarklist.cpp')
| -rw-r--r-- | indra/newview/lllandmarklist.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp index 2966ca1f10..b4236c406b 100644 --- a/indra/newview/lllandmarklist.cpp +++ b/indra/newview/lllandmarklist.cpp @@ -33,7 +33,7 @@ #include "llappviewer.h" #include "llagent.h" -#include "llfilesystem.h" +#include "llvfile.h" #include "llviewerstats.h" // Globals @@ -118,6 +118,7 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t // static void LLLandmarkList::processGetAssetReply( + LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type, void* user_data, @@ -126,7 +127,7 @@ void LLLandmarkList::processGetAssetReply( { if( status == 0 ) { - LLFileSystem file(uuid, type); + LLVFile file(vfs, uuid, type); S32 file_length = file.getSize(); std::vector<char> buffer(file_length + 1); |