From b4fde4edf6516af0765d983629eb01e5d2be7933 Mon Sep 17 00:00:00 2001
From: elektrahesse
Date: Tue, 12 Oct 2010 08:48:57 +0200
Subject: Fixed a mac-only crash caused by uploading non-power-of-two images
 (wasn't crashing in bulk upload, only on single texture upload).

---
 linden/indra/newview/llfloaterimagepreview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index c81081f..389bd5a 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -434,9 +434,9 @@ bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
 		return false;
 	}
 
-	raw_image->biasedScaleToPowerOfTwo(1024);
 #endif
 
+	raw_image->biasedScaleToPowerOfTwo(1024);
 	mRawImagep = raw_image;
 	return true;
 }
-- 
cgit v1.1