diff options
| author | Don Kjer <don@lindenlab.com> | 2012-12-06 22:54:50 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-12-06 22:54:50 +0000 |
| commit | 07d05c2967fb1013a3f21c1c055ad068b2be9995 (patch) | |
| tree | dc06635670b65798d824595486f314a809d7dd88 /indra/newview/llviewertexlayer.cpp | |
| parent | 96ef49df75c0248e4843f9a5b53f010b819d59f3 (diff) | |
Alpha rendering fixes for appearance utility.
Diffstat (limited to 'indra/newview/llviewertexlayer.cpp')
| -rwxr-xr-x | indra/newview/llviewertexlayer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp index cd5e781d71..f3c9921819 100755 --- a/indra/newview/llviewertexlayer.cpp +++ b/indra/newview/llviewertexlayer.cpp @@ -416,7 +416,10 @@ void LLViewerTexLayerSetBuffer::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); + 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' |