From f8a43c48150bb804a13c6964620cebdd98345282 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 4 Apr 2014 16:28:36 +0300
Subject: [PATCH] MAINT-3913 FIXED User is not able to upload any type of
image(*.png, *.tga,*.bmp,*.jpg)
---
indra/llimage/llimage.cpp | 2 +-
indra/llimage/llimagepng.cpp | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 55609deb2b4..183620f9bc0 100755
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -1493,7 +1493,7 @@ void LLImageFormatted::sanityCheck()
BOOL LLImageFormatted::copyData(U8 *data, S32 size)
{
- if ( data && getData() && ((data != getData()) || (size != getDataSize())) )
+ if ( data && ((data != getData()) || (size != getDataSize())) )
{
deleteData();
allocateData(size);
diff --git a/indra/llimage/llimagepng.cpp b/indra/llimage/llimagepng.cpp
index 525aa8d78c3..294f68b1220 100755
--- a/indra/llimage/llimagepng.cpp
+++ b/indra/llimage/llimagepng.cpp
@@ -94,13 +94,6 @@ BOOL LLImagePNG::decode(LLImageRaw* raw_image, F32 decode_time)
return FALSE;
}
- // Check to make sure that this instance has been initialized with data
- if (!raw_image->getData())
- {
- setLastError("LLImagePNG trying to decode an image into unallocated LLImageRaw!");
- return FALSE;
- }
-
// Decode the PNG data into the raw image
LLPngWrapper pngWrapper;
if (!pngWrapper.isValidPng(getData()))
--
GitLab