diff options
| author | Don Kjer <don@lindenlab.com> | 2012-12-06 22:56:21 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-12-06 22:56:21 +0000 |
| commit | 23d77d3a34e48de6e9c69d60cdbd1d70766ad16c (patch) | |
| tree | 84c2878deeb7ba8f4e408365ca53c3d119a15cb1 /indra/llvfs | |
| parent | 07d05c2967fb1013a3f21c1c055ad068b2be9995 (diff) | |
| parent | 97adf6422ac61148a3334d67b4c59a5f5437af2c (diff) | |
Automated merge
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; } |