diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-12-15 14:37:18 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-12-15 14:37:18 -0700 |
| commit | cf35d27dfb86a8a8d8223bc344f35984efaa7b98 (patch) | |
| tree | 883758ee1282e0936343ec27d80d25329aae9242 /indra/newview/llfloaterregioninfo.cpp | |
| parent | 199775b7ac214cfc3492c343c3f6046effcde7ed (diff) | |
| parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) | |
DRTVWR-546 merge up to 6.5.2
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 17e55b5f2c..19080f05c0 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -36,7 +36,7 @@ #include "llglheaders.h" #include "llregionflags.h" #include "llstl.h" -#include "llvfile.h" +#include "llfilesystem.h" #include "llxfermanager.h" #include "indra_constants.h" #include "message.h" @@ -2252,10 +2252,9 @@ void LLPanelEstateCovenant::loadInvItem(LLInventoryItem *itemp) } // static -void LLPanelEstateCovenant::onLoadComplete(LLVFS *vfs, - const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status) +void LLPanelEstateCovenant::onLoadComplete(const LLUUID& asset_uuid, + LLAssetType::EType type, + void* user_data, S32 status, LLExtStat ext_status) { LL_INFOS() << "LLPanelEstateCovenant::onLoadComplete()" << LL_ENDL; LLPanelEstateCovenant* panelp = (LLPanelEstateCovenant*)user_data; @@ -2263,7 +2262,7 @@ void LLPanelEstateCovenant::onLoadComplete(LLVFS *vfs, { if(0 == status) { - LLVFile file(vfs, asset_uuid, type, LLVFile::READ); + LLFileSystem file(asset_uuid, type, LLFileSystem::READ); S32 file_length = file.getSize(); |