diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-03-10 09:54:54 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-03-10 09:59:41 -0700 |
| commit | f6ddd91dd6cb908e12cd6223273b3199675bcbe8 (patch) | |
| tree | 44bdbefda6a8638cd4e976f00456f37fcf597c5c /indra/newview/llviewermessage.cpp | |
| parent | a0b9fd6eb0dacfec30df0caac8dbbd7c25366c72 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' v6.4.17 into DRTVWR-528
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6ef452bd92..458fc3b13d 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -44,7 +44,8 @@ #include "llteleportflags.h" #include "lltoastnotifypanel.h" #include "lltransactionflags.h" -#include "llfilesystem.h" +#include "llvfile.h" +#include "llvfs.h" #include "llxfermanager.h" #include "mean_collision_data.h" @@ -6843,15 +6844,16 @@ void process_covenant_reply(LLMessageSystem* msg, void**) } } -void onCovenantLoadComplete(const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status) +void onCovenantLoadComplete(LLVFS *vfs, + const LLUUID& asset_uuid, + LLAssetType::EType type, + void* user_data, S32 status, LLExtStat ext_status) { LL_DEBUGS("Messaging") << "onCovenantLoadComplete()" << LL_ENDL; std::string covenant_text; if(0 == status) { - LLFileSystem file(asset_uuid, type, LLFileSystem::READ); + LLVFile file(vfs, asset_uuid, type, LLVFile::READ); S32 file_length = file.getSize(); |