1 files changed, 20 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index 9dfaa49..0a91563 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -33,6 +33,7 @@
 #include "llimagebmp.h"
 #include "llimagetga.h"
 #include "llimagejpeg.h"
+#include "llimagepng.h"
 
 #include "llagent.h"
 #include "llbutton.h"
@@ -325,6 +326,10 @@ bool LLFloaterImagePreview::loadImage(const char *src_filename)
         {
                 codec = IMG_CODEC_JPEG;
         }
+        else if( 0 == strnicmp(ext, ".png", 4) )
+        {
+                codec = IMG_CODEC_PNG;
+        }
 
         LLPointer<LLImageRaw> raw_image = new LLImageRaw;
 
@@ -382,6 +387,21 @@ bool LLFloaterImagePreview::loadImage(const char *src_filename)
                         }
                 }
                 break;
+        case IMG_CODEC_PNG:
+                {
+                        LLPointer<LLImagePNG> png_image = new LLImagePNG;
+
+                        if (!png_image->load(src_filename))
+                        {
+                                return false;
+                        }
+                        
+                        if (!png_image->decode(raw_image))
+                        {
+                                return false;
+                        }
+                }
+                break;
         default:
                 return false;
         }