diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:41:49 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:41:49 +0000 |
| commit | a0b9fd6eb0dacfec30df0caac8dbbd7c25366c72 (patch) | |
| tree | 229a96783c6534a36ce48bdb83108ce26ac24b2f /indra/newview/llfloaterbvhpreview.cpp | |
| parent | 2cad61d76ba48fe2adfda120bc21ca66166b7385 (diff) | |
| parent | 10241c5596402a145e4087c36014d84507183c32 (diff) | |
Merged in DV528-merge-6.4.15 (pull request #484)
DRTVWR-528 merge up to 6.4.15
Diffstat (limited to 'indra/newview/llfloaterbvhpreview.cpp')
| -rw-r--r-- | indra/newview/llfloaterbvhpreview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp index 131d9b077b..687d820a18 100644 --- a/indra/newview/llfloaterbvhpreview.cpp +++ b/indra/newview/llfloaterbvhpreview.cpp @@ -32,7 +32,7 @@ #include "lldatapacker.h" #include "lldir.h" #include "llnotificationsutil.h" -#include "llvfile.h" +#include "llfilesystem.h" #include "llapr.h" #include "llstring.h" @@ -997,10 +997,9 @@ void LLFloaterBvhPreview::onBtnOK(void* userdata) LLDataPackerBinaryBuffer dp(buffer, file_size); if (motionp->serialize(dp)) { - LLVFile file(gVFS, motionp->getID(), LLAssetType::AT_ANIMATION, LLVFile::APPEND); + LLFileSystem file(motionp->getID(), LLAssetType::AT_ANIMATION, LLFileSystem::APPEND); S32 size = dp.getCurrentSize(); - file.setMaxSize(size); if (file.write((U8*)buffer, size)) { std::string name = floaterp->getChild<LLUICtrl>("name_form")->getValue().asString(); |