From c83e740ef94e16ba85574454f3138905edecb029 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 8 Mar 2021 13:56:16 +0000 Subject: Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5. --- indra/newview/llfloaterreporter.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfloaterreporter.cpp') diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 5d0e2bbc55..7bfba2a6d7 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -44,7 +44,8 @@ #include "llnotificationsutil.h" #include "llstring.h" #include "llsys.h" -#include "llfilesystem.h" +#include "llvfile.h" +#include "llvfs.h" #include "mean_collision_data.h" #include "message.h" #include "v3math.h" @@ -898,9 +899,12 @@ void LLFloaterReporter::takeScreenshot(bool use_prev_screenshot) mResourceDatap->mAssetInfo.setName("screenshot_name"); mResourceDatap->mAssetInfo.setDescription("screenshot_descr"); - // store in cache - LLFileSystem j2c_file(mResourceDatap->mAssetInfo.mUuid, mResourceDatap->mAssetInfo.mType, LLFileSystem::WRITE); - j2c_file.write(upload_data->getData(), upload_data->getDataSize()); + // store in VFS + LLVFile::writeFile(upload_data->getData(), + upload_data->getDataSize(), + gVFS, + mResourceDatap->mAssetInfo.mUuid, + mResourceDatap->mAssetInfo.mType); // store in the image list so it doesn't try to fetch from the server LLPointer image_in_list = -- cgit v1.2.3