diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-04-05 22:05:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-04-05 22:05:00 -0700 |
| commit | 91094d92a75b3900be15bfb8be4b9f7cc072487b (patch) | |
| tree | b04053971c6f6efdb2e69409887579fc92b0b01d /indra/newview | |
| parent | 782981866a70f4a33a298c93ee80aaf138fdf459 (diff) | |
SH-3060 : Implement new byte range computation, cleaned up use of compression rate as well.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 1693cfc9e2..467115c928 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -497,7 +497,6 @@ void LLTexLayerSetBuffer::doUpload() } LLPointer<LLImageJ2C> compressedImage = new LLImageJ2C; - compressedImage->setRate(0.f); const char* comment_text = LINDEN_J2C_COMMENT_PREFIX "RGBHM"; // writes into baked_color_data. 5 channels (rgb, heightfield/alpha, mask) if (compressedImage->encode(baked_image, comment_text)) { diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 089f45ca89..54ae519422 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1030,7 +1030,6 @@ LLPointer<LLImageJ2C> LLViewerTextureList::convertToUploadFile(LLPointer<LLImage { raw_image->biasedScaleToPowerOfTwo(LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT); LLPointer<LLImageJ2C> compressedImage = new LLImageJ2C(); - compressedImage->setRate(0.f); if (gSavedSettings.getBOOL("LosslessJ2CUpload") && (raw_image->getWidth() * raw_image->getHeight() <= LL_IMAGE_REZ_LOSSLESS_CUTOFF * LL_IMAGE_REZ_LOSSLESS_CUTOFF)) |