From 31ba05810c641f14e8ab5da8ad2aaf527779f6c1 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:37 -0500
Subject: Second Life viewer sources 1.19.1.2

---
 linden/indra/newview/llfloaterimagepreview.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'linden/indra/newview/llfloaterimagepreview.cpp')

diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index 551ae95..926a117 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -353,7 +353,7 @@ bool LLFloaterImagePreview::loadImage(const char *src_filename)
 				return false;
 			}
 			
-			if (!bmp_image->decode(raw_image))
+			if (!bmp_image->decode(raw_image, 0.0f))
 			{
 				return false;
 			}
@@ -390,7 +390,7 @@ bool LLFloaterImagePreview::loadImage(const char *src_filename)
 				return false;
 			}
 			
-			if (!jpeg_image->decode(raw_image))
+			if (!jpeg_image->decode(raw_image, 0.0f))
 			{
 				return false;
 			}
@@ -405,7 +405,7 @@ bool LLFloaterImagePreview::loadImage(const char *src_filename)
 				return false;
 			}
 			
-			if (!png_image->decode(raw_image))
+			if (!png_image->decode(raw_image, 0.0f))
 			{
 				return false;
 			}
@@ -589,7 +589,8 @@ BOOL LLFloaterImagePreview::handleScrollWheel(S32 x, S32 y, S32 clicks)
 //-----------------------------------------------------------------------------
 // onMouseCaptureLost()
 //-----------------------------------------------------------------------------
-void LLFloaterImagePreview::onMouseCaptureLost(LLMouseHandler* handler)
+// static
+void LLFloaterImagePreview::onMouseCaptureLostImagePreview(LLMouseHandler* handler)
 {
 	gViewerWindow->showCursor();
 }
-- 
cgit v1.1