Merge branch 'master' into DRTVWR-522-maint

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();