diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
| commit | 761bf254a4e72ec521ff1a52ac12f8594a350818 (patch) | |
| tree | c72f84bb4ac319c10299a35934b52a09a73a127d /indra/llvfs | |
| parent | a2fa9a2bc26bb67c0bb952d3295c380dcb853eb5 (diff) | |
| parent | 1e41b017e1713a35eb68190d279cf8d28791b6d2 (diff) | |
merge changes for 3.6.0-release
Diffstat (limited to 'indra/llvfs')
| -rwxr-xr-x | indra/llvfs/lldir_win32.cpp | 2 | ||||
| -rwxr-xr-x | indra/llvfs/llvfile.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp index 462d1cce06..6184095957 100755 --- a/indra/llvfs/lldir_win32.cpp +++ b/indra/llvfs/lldir_win32.cpp @@ -131,7 +131,7 @@ LLDir_Win32::LLDir_Win32() mAppRODataDir = mExecutableDir; } - llinfos << "mAppRODataDir = " << mAppRODataDir << llendl; +// llinfos << "mAppRODataDir = " << mAppRODataDir << llendl; mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins"; 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 */ |