diff options
| author | prep@lindenlab.com <prep@lindenlab.com> | 2012-11-30 16:59:15 -0600 |
|---|---|---|
| committer | prep@lindenlab.com <prep@lindenlab.com> | 2012-11-30 16:59:15 -0600 |
| commit | f0a11b1590a8d52281683275f836ac347ccc510f (patch) | |
| tree | 6466350818878969f5d2aac93cf3dea5bab115a2 /indra/llvfs | |
| parent | 96ef49df75c0248e4843f9a5b53f010b819d59f3 (diff) | |
SH-3594: Fix for crash when outfits are changed on a non server based baking region.
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/llvfile.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp index ca749c5eaf..03d2cc25e3 100644 --- a/indra/llvfs/llvfile.cpp +++ b/indra/llvfs/llvfile.cpp @@ -32,6 +32,7 @@ #include "llthread.h" #include "llstat.h" #include "llvfs.h" +#include "llmemory.h" const S32 LLVFile::READ = 0x00000001; const S32 LLVFile::WRITE = 0x00000002; @@ -134,13 +135,13 @@ U8* LLVFile::readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S data = NULL; } else - { - data = new U8[file_size]; + { + data = (U8*) ll_aligned_malloc_16(file_size); file.read(data, file_size); /* Flawfinder: ignore */ if (file.getLastBytesRead() != (S32)file_size) { - delete[] data; + ll_aligned_free(data); data = NULL; file_size = 0; } |