diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-03-02 14:49:34 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-03-02 14:49:34 -0800 |
| commit | 3b02f547142b1907369284cb07f275228eeec77b (patch) | |
| tree | b2152323a43823a75ea6c5a980b36977d1827b9f /indra/newview/llfloaterbvhpreview.cpp | |
| parent | 2aea7cfc25d42e3d87db4fb759baa4419ec23dca (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) | |
Merge branch 'master' into DRTVWR-531
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(); |