summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateranimpreview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloateranimpreview.cpp')
-rw-r--r--indra/newview/llfloateranimpreview.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp
index 22617a7fcc..7085407999 100644
--- a/indra/newview/llfloateranimpreview.cpp
+++ b/indra/newview/llfloateranimpreview.cpp
@@ -34,7 +34,7 @@
#include "llviewercamera.h"
#include "llviewerobjectlist.h"
#include "llviewerwindow.h"
-#include "llviewermenu.h"
+#include "llviewermenufile.h" // upload_new_resource()
#include "llvoavatar.h"
#include "pipeline.h"
#include "viewer.h"
@@ -201,7 +201,7 @@ BOOL LLFloaterAnimPreview::postBuild()
}
apr_file_close(fp);
- delete file_buffer;
+ delete[] file_buffer;
}
}
@@ -227,11 +227,11 @@ BOOL LLFloaterAnimPreview::postBuild()
// pass animation data through memory buffer
loaderp->serialize(dp);
dp.reset();
- BOOL success = motionp->deserialize(dp);
+ BOOL success = motionp && motionp->deserialize(dp);
delete []buffer;
- if (motionp && success)
+ if (success)
{
const LLBBoxLocal &pelvis_bbox = motionp->getPelvisBBox();