From 4519b38d35bfd59887dc648f5b275ea9dd79ea2f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 14 Aug 2025 20:37:59 +0200 Subject: [PATCH] Revert "Adjust error message to new format" This reverts commit c40e58fd049c1898999d1f80ca77db6048d65011. --- indra/newview/lllocalbitmaps.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index cf7325b8a0..acba417688 100644 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -1127,23 +1127,15 @@ bool LLLocalBitmapMgr::checkTextureDimensions(std::string filename) } // allow loading up to 4x max rez but implicitly downrez to max rez before upload - // Fix broken error message - //S32 max_width = gSavedSettings.getS32("max_texture_dimension_X")*4; - //S32 max_height = gSavedSettings.getS32("max_texture_dimension_Y")*4; + S32 max_width = gSavedSettings.getS32("max_texture_dimension_X")*4; + S32 max_height = gSavedSettings.getS32("max_texture_dimension_Y")*4; - //if ((image_info.getWidth() > max_width) || (image_info.getHeight() > max_height)) - //{ - // LLStringUtil::format_map_t args; - // args["WIDTH"] = llformat("%d", max_width); - // args["HEIGHT"] = llformat("%d", max_height); - // mImageLoadError = LLTrans::getString("texture_load_dimensions_error", args); - if (image_info.getWidth() * image_info.getHeight() > MAX_IMAGE_AREA) + if ((image_info.getWidth() > max_width) || (image_info.getHeight() > max_height)) { LLStringUtil::format_map_t args; - args["PIXELS"] = llformat("%dM", (S32)(MAX_IMAGE_AREA / 1000000)); - + args["WIDTH"] = llformat("%d", max_width); + args["HEIGHT"] = llformat("%d", max_height); mImageLoadError = LLTrans::getString("texture_load_dimensions_error", args); - // LLSD notif_args; notif_args["REASON"] = mImageLoadError;