diff options
| author | voidpointer <none@none> | 2012-10-18 15:34:43 -0700 |
|---|---|---|
| committer | voidpointer <none@none> | 2012-10-18 15:34:43 -0700 |
| commit | 88fb47bf84b4e995ca36632fc9154cb5a3763def (patch) | |
| tree | ac984df2807dd321508eb2838b2386a215691b59 /indra/newview/lltexlayer.cpp | |
| parent | 48b2dbcd65e72994054b9e525c0e45e346a981fb (diff) | |
| parent | 9cc1dfd4e6f3859e690da578adde057ec9a82e18 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 467115c928..ad09af6594 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -510,7 +510,13 @@ void LLTexLayerSetBuffer::doUpload() BOOL valid = FALSE; LLPointer<LLImageJ2C> integrity_test = new LLImageJ2C; S32 file_size = 0; - U8* data = LLVFile::readFile(gVFS, asset_id, LLAssetType::AT_TEXTURE, &file_size); + + //data buffer MUST be allocated using LLImageBase + LLVFile file(gVFS, asset_id, LLAssetType::AT_TEXTURE); + file_size = file.getSize(); + U8* data = integrity_test->allocateData(file_size); + file.read(data, file_size); + if (data) { valid = integrity_test->validate(data, file_size); // integrity_test will delete 'data' |