diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-08 14:46:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-08 14:46:00 -0400 |
| commit | 1b984d8f40d805341b8c1fc670c29b32c25ce227 (patch) | |
| tree | fb73a6224dfe7ff7d5bf4619a799b0ededffcb64 /indra/llvfs | |
| parent | 21ba1e9c1e8afeb1b3cf67462f6e16ff8f6ae91a (diff) | |
| parent | 1beb15c93b139e4494bb90cce30b1c67accb4b08 (diff) | |
merge changes for 3.5.1-release
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/llvfile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp index 306d7d8ec7..03d2cc25e3 100644 --- a/indra/llvfs/llvfile.cpp +++ b/indra/llvfs/llvfile.cpp @@ -135,7 +135,7 @@ U8* LLVFile::readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S data = NULL; } else - { + { data = (U8*) ll_aligned_malloc_16(file_size); file.read(data, file_size); /* Flawfinder: ignore */ |