aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorelektrahesse2010-10-12 08:48:57 +0200
committerelektrahesse2010-10-12 08:48:57 +0200
commitb4fde4edf6516af0765d983629eb01e5d2be7933 (patch)
tree7d80752079fb4198a484740f6c84f1f709da1f66
parentMerge remote branch 'aleric/weekly' into weekly (diff)
downloadmeta-impy-b4fde4edf6516af0765d983629eb01e5d2be7933.zip
meta-impy-b4fde4edf6516af0765d983629eb01e5d2be7933.tar.gz
meta-impy-b4fde4edf6516af0765d983629eb01e5d2be7933.tar.bz2
meta-impy-b4fde4edf6516af0765d983629eb01e5d2be7933.tar.xz
Fixed a mac-only crash caused by uploading non-power-of-two images (wasn't crashing in bulk upload, only on single texture upload).
-rw-r--r--linden/indra/newview/llfloaterimagepreview.cpp2
1 files changed, 1 insertions, 1 deletions
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)
434 return false; 434 return false;
435 } 435 }
436 436
437 raw_image->biasedScaleToPowerOfTwo(1024);
438#endif 437#endif
439 438
439 raw_image->biasedScaleToPowerOfTwo(1024);
440 mRawImagep = raw_image; 440 mRawImagep = raw_image;
441 return true; 441 return true;
442} 442}