From c83e740ef94e16ba85574454f3138905edecb029 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 8 Mar 2021 13:56:16 +0000
Subject: Revert "Merge branch 'master' of
 https://bitbucket.org/lindenlab/viewer into DRTVWR-519"

This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing
changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
---
 indra/newview/lllandmarklist.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/lllandmarklist.cpp')

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);
-- 
cgit v1.2.3