From 1ac600f3839d298ea6ce202d6f213b4d6e3f5dd4 Mon Sep 17 00:00:00 2001 From: Zi Ree Date: Thu, 20 Apr 2023 03:49:52 +0200 Subject: [PATCH] FIRE-32893 - fix crash on image upload, make sure to grab the checkbox pointer even when there is no alpha channel at all --- indra/newview/llfloaterimagepreview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp index dc57b37973..bedfd6a9f7 100644 --- a/indra/newview/llfloaterimagepreview.cpp +++ b/indra/newview/llfloaterimagepreview.cpp @@ -186,6 +186,8 @@ BOOL LLFloaterImagePreview::postBuild() getChild("uploaded_size_text")->setTextArg("[X_RES]", llformat("%d", mRawImagep->getWidth())); getChild("uploaded_size_text")->setTextArg("[Y_RES]", llformat("%d", mRawImagep->getHeight())); + mEmptyAlphaCheck = getChild("strip_alpha_check"); + if (mRawImagep->getComponents() != 4) { getChild("image_alpha_warning")->setVisible(false); @@ -205,8 +207,6 @@ BOOL LLFloaterImagePreview::postBuild() } } - mEmptyAlphaCheck = getChild("strip_alpha_check"); - if (emptyAlphaCount > (imageBytes / 4 * ALPHA_EMPTY_THRESHOLD_RATIO)) { getChild("image_alpha_warning")->setVisible(true);