Second Life viewer sources 1.17.1.0

1 files changed, 16 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 4e87905..fce719f 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -38,6 +38,7 @@
 #include "llimagej2c.h"
 #include "llimagetga.h"
 #include "llimagejpeg.h"
+#include "llimagepng.h"
 #include "llmediaengine.h"
 
 #include "llsdserialize.h"
@@ -1081,6 +1082,21 @@ BOOL LLViewerImageList::createUploadFile(const LLString& filename,
                   }
           }
           break;
+          case IMG_CODEC_PNG:
+          {
+                  LLPointer<LLImagePNG> png_image = new LLImagePNG;
+
+                  if (!png_image->load(filename))
+                  {
+                          return FALSE;
+                  }
+
+                  if (!png_image->decode(raw_image))
+                  {
+                          return FALSE;
+                  }
+          }
+          break;
           default:
                 return FALSE;
         }