diff options
| author | Richard Linden <none@none> | 2013-09-26 11:34:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-26 11:34:15 -0700 |
| commit | 1733be96680e7ceb1911acc6af7fa3e12282fad7 (patch) | |
| tree | ad90c9eb2302a16fcaf3d888b4c58bc274361316 /indra/llvfs | |
| parent | 458990b435dabf0d9ad598920fdf9a3dd84e2f8e (diff) | |
| parent | 4db06820f0a89d480a3d5c49c26313a3bb78544d (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llvfs')
| -rwxr-xr-x | indra/llvfs/llvfile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp index 2af7a7d35d..9b57246ea1 100755 --- a/indra/llvfs/llvfile.cpp +++ b/indra/llvfs/llvfile.cpp @@ -137,12 +137,12 @@ U8* LLVFile::readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S } else { - data = (U8*) ll_aligned_malloc_16(file_size); + data = (U8*) ll_aligned_malloc(16, file_size); file.read(data, file_size); /* Flawfinder: ignore */ if (file.getLastBytesRead() != (S32)file_size) { - ll_aligned_free(data); + ll_aligned_free(16, data); data = NULL; file_size = 0; } |