diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-01 08:11:15 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-01 08:11:15 -0700 |
| commit | 025c8909582f59f68f786d52bea06f5a272df0b5 (patch) | |
| tree | 6d9980e216f89c74776155432b32e6778f3b6367 /indra/llvfs | |
| parent | 536a30d7f2083d39dbd6d06f16fa53064c3ee379 (diff) | |
| parent | 70c1e21956b8589c9873ac5fa6a05467dc2e0a89 (diff) | |
Merge vwr-dev-mat
Diffstat (limited to 'indra/llvfs')
| -rwxr-xr-x | 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 03d2cc25e3..306d7d8ec7 100755 --- 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 */ |