From 168d177197bd7558bbe0ca13d01c984ad8638da7 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 9 Mar 2021 14:39:51 -0800
Subject: This set of changes reverts the merge with master (git revert
c83e740) and results in a version of the DRTVWR-519 that matches what was
presemt before it was deployed as a release viewer *plus* 3 small fixes from
Maxim (See commits). This branch can now be used for additional fixes before
eventually being used to release D-519 as normal
---
indra/newview/lllandmarklist.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'indra/newview/lllandmarklist.cpp')
diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp
index b4236c406b..2966ca1f10 100644
--- a/indra/newview/lllandmarklist.cpp
+++ b/indra/newview/lllandmarklist.cpp
@@ -33,7 +33,7 @@
#include "llappviewer.h"
#include "llagent.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "llviewerstats.h"
// Globals
@@ -118,7 +118,6 @@ 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,
@@ -127,7 +126,7 @@ void LLLandmarkList::processGetAssetReply(
{
if( status == 0 )
{
- LLVFile file(vfs, uuid, type);
+ LLFileSystem file(uuid, type);
S32 file_length = file.getSize();
std::vector<char> buffer(file_length + 1);
--
cgit v1.2.3