diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-12-15 20:34:49 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-12-15 20:34:49 +0000 |
| commit | 0cb712af5cc8be9025fce82eac65408fab759505 (patch) | |
| tree | 0361f80565053ec2183277eeb73c6c6dbf8d06f6 /indra/newview/llfloaterbvhpreview.cpp | |
| parent | 101e282ca3d0e8ca0bf10b32a2a4b6362bc66b80 (diff) | |
| parent | e27f9551e1cae0f3fca22989bcbd256a876fd80d (diff) | |
Merged in DV528-merge-6.5.2 (pull request #813)
DRTVWR-528 merge up to 6.5.2
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(); |