diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:41:37 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:41:37 +0200 |
| commit | 135d54a4ff46c7e3230b8baeedaee886cb2f11c4 (patch) | |
| tree | 4f55540281efcc3007d73ff95e6e19aa7ba2390c /indra/newview/lllandmarklist.cpp | |
| parent | 4add069cae879a626c284ea13aeb1b42b3ca5dfc (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) | |
Merge branch 'master' into DRTVWR-516-maint
Diffstat (limited to 'indra/newview/lllandmarklist.cpp')
| -rw-r--r-- | indra/newview/lllandmarklist.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp index 0a05ce6ab8..beb8aeef48 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(); if (file_length > 0) |