diff options
| author | Callum Prentice <callum@gmail.com> | 2020-09-16 18:53:24 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-09-16 18:53:24 -0700 |
| commit | 3fc07dea01795b31c37dcd093ec73d190a1e188a (patch) | |
| tree | b000b56002957e5d0367aa87f0b03b8827181474 /indra/newview/llviewermessage.cpp | |
| parent | 060dd2aeab72df26d6375f2e0fad619113fe7e13 (diff) | |
First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 06a8ebbe89..2d41560441 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -45,7 +45,6 @@ #include "lltoastnotifypanel.h" #include "lltransactionflags.h" #include "llvfile.h" -#include "llvfs.h" #include "llxfermanager.h" #include "mean_collision_data.h" @@ -6809,16 +6808,15 @@ void process_covenant_reply(LLMessageSystem* msg, void**) } } -void onCovenantLoadComplete(LLVFS *vfs, - const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status) +void onCovenantLoadComplete(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) { - LLVFile file(vfs, asset_uuid, type, LLVFile::READ); + LLVFile file(asset_uuid, type, LLVFile::READ); S32 file_length = file.getSize(); |