diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 22:00:08 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 22:00:08 +0200 |
| commit | 19ff86fabd84ba45bbbdfd1fa5393fb9ab89dddf (patch) | |
| tree | 4160038613ed7efe5c806bdb11379ea453e48900 /indra/newview/llsettingsvo.cpp | |
| parent | be83a004db5831958837d9caa3bf7c98fedc3bf2 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' into DRTVWR-522-maint
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 58cbe0e20a..1e5b893cbc 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -57,7 +57,7 @@ #include "llinventorymodel.h" #include "llassetstorage.h" -#include "llfilesystem.h" +#include "llvfile.h" #include "lldrawpoolwater.h" #include <boost/algorithm/string/replace.hpp> @@ -292,18 +292,18 @@ void LLSettingsVOBase::onTaskAssetUploadComplete(LLUUID itemId, LLUUID taskId, L void LLSettingsVOBase::getSettingsAsset(const LLUUID &assetId, LLSettingsVOBase::asset_download_fn callback) { gAssetStorage->getAssetData(assetId, LLAssetType::AT_SETTINGS, - [callback](const LLUUID &asset_id, LLAssetType::EType, void *, S32 status, LLExtStat ext_status) - { onAssetDownloadComplete(asset_id, status, ext_status, callback); }, + [callback](LLVFS *vfs, const LLUUID &asset_id, LLAssetType::EType, void *, S32 status, LLExtStat ext_status) + { onAssetDownloadComplete(vfs, asset_id, status, ext_status, callback); }, nullptr, true); } -void LLSettingsVOBase::onAssetDownloadComplete(const LLUUID &asset_id, S32 status, LLExtStat ext_status, LLSettingsVOBase::asset_download_fn callback) +void LLSettingsVOBase::onAssetDownloadComplete(LLVFS *vfs, const LLUUID &asset_id, S32 status, LLExtStat ext_status, LLSettingsVOBase::asset_download_fn callback) { LLSettingsBase::ptr_t settings; if (!status) { - LLFileSystem file(asset_id, LLAssetType::AT_SETTINGS, LLFileSystem::READ); + LLVFile file(vfs, asset_id, LLAssetType::AT_SETTINGS, LLVFile::READ); S32 size = file.getSize(); std::string buffer(size + 1, '\0'); |