diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-03-10 09:27:21 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-03-10 09:34:16 -0700 |
commit | 303feae305eb526d75b7d9c8b640407cb8003469 (patch) | |
tree | 0e322ed210d9600530f0d916fbb18f8330e6aee7 /indra/newview/llsnapshotlivepreview.cpp | |
parent | 9fdd1582774a928242b7fec91bbd951b123296e8 (diff) | |
parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) |
Merge branch 'master' v6.4.17 into DRTVWR-525
Diffstat (limited to 'indra/newview/llsnapshotlivepreview.cpp')
-rw-r--r-- | indra/newview/llsnapshotlivepreview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp index 8134187c21..8369def968 100644 --- a/indra/newview/llsnapshotlivepreview.cpp +++ b/indra/newview/llsnapshotlivepreview.cpp @@ -31,7 +31,6 @@ #include "llagentbenefits.h" #include "llagentcamera.h" #include "llagentui.h" -#include "llfilesystem.h" #include "llcombobox.h" #include "llfloaterperms.h" #include "llfloaterreg.h" @@ -51,6 +50,8 @@ #include "llviewercontrol.h" #include "llviewermenufile.h" // upload_new_resource() #include "llviewerstats.h" +#include "llvfile.h" +#include "llvfs.h" #include "llwindow.h" #include "llworld.h" #include <boost/filesystem.hpp> @@ -1005,8 +1006,7 @@ void LLSnapshotLivePreview::saveTexture(BOOL outfit_snapshot, std::string name) if (formatted->encode(scaled, 0.0f)) { - LLFileSystem fmt_file(new_asset_id, LLAssetType::AT_TEXTURE, LLFileSystem::WRITE); - fmt_file.write(formatted->getData(), formatted->getDataSize()); + LLVFile::writeFile(formatted->getData(), formatted->getDataSize(), gVFS, new_asset_id, LLAssetType::AT_TEXTURE); std::string pos_string; LLAgentUI::buildLocationString(pos_string, LLAgentUI::LOCATION_FORMAT_FULL); std::string who_took_it; |