diff options
author | Jacek Antonelli | 2008-09-12 14:59:33 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-12 14:59:39 -0500 |
commit | 80a8bab2a9dd8e77262b001af973212a6cba4a5a (patch) | |
tree | 170168232fd4e2eec5f15295a9445535969cdb76 /linden/indra/newview/llviewerimagelist.cpp | |
parent | Second Life viewer sources 1.21.1-RC (diff) | |
download | meta-impy-80a8bab2a9dd8e77262b001af973212a6cba4a5a.zip meta-impy-80a8bab2a9dd8e77262b001af973212a6cba4a5a.tar.gz meta-impy-80a8bab2a9dd8e77262b001af973212a6cba4a5a.tar.bz2 meta-impy-80a8bab2a9dd8e77262b001af973212a6cba4a5a.tar.xz |
Second Life viewer sources 1.21.2-RC
Diffstat (limited to 'linden/indra/newview/llviewerimagelist.cpp')
-rw-r--r-- | linden/indra/newview/llviewerimagelist.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp index 28f51e1..a79a76a 100644 --- a/linden/indra/newview/llviewerimagelist.cpp +++ b/linden/indra/newview/llviewerimagelist.cpp | |||
@@ -909,8 +909,7 @@ LLPointer<LLImageJ2C> LLViewerImageList::convertToUploadFile(LLPointer<LLImageRa | |||
909 | compressedImage->setRate(0.f); | 909 | compressedImage->setRate(0.f); |
910 | 910 | ||
911 | if (gSavedSettings.getBOOL("LosslessJ2CUpload") && | 911 | if (gSavedSettings.getBOOL("LosslessJ2CUpload") && |
912 | (raw_image->getWidth() <= LL_IMAGE_REZ_LOSSLESS_CUTOFF) && | 912 | (raw_image->getWidth() * raw_image->getHeight() <= LL_IMAGE_REZ_LOSSLESS_CUTOFF * LL_IMAGE_REZ_LOSSLESS_CUTOFF)) |
913 | (raw_image->getHeight() <= LL_IMAGE_REZ_LOSSLESS_CUTOFF)) | ||
914 | compressedImage->setReversible(TRUE); | 913 | compressedImage->setReversible(TRUE); |
915 | 914 | ||
916 | compressedImage->encode(raw_image, 0.0f); | 915 | compressedImage->encode(raw_image, 0.0f); |