Merge tag 'Second_Life_Release#37a04baf-2025.06' into 2025.06

1 files changed, 15 insertions, 1 deletions

diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp
index 42a5df5d17..550c3adc27 100644
--- a/indra/newview/llfloaterimagepreview.cpp
+++ b/indra/newview/llfloaterimagepreview.cpp
@@ -288,7 +288,9 @@ void LLFloaterImagePreview::onBtnOK()
         }
         else
         {
-            LLNotificationsUtil::add("ErrorEncodingImage");
+            LLSD args;
+            args["REASON"] = LLImage::getLastThreadError();
+            LLNotificationsUtil::add("ErrorEncodingImage", args);
             LL_WARNS() << "Error encoding image" << LL_ENDL;
         }
     }
@@ -423,6 +425,18 @@ bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
         return false;
     }
 
+    // raw image is limited to 256MB so need at least some upper limit that fits into that
+    constexpr S32 MAX_IMAGE_AREA = 8096 * 8096;
+
+    if (image_info.getWidth() * image_info.getHeight() > MAX_IMAGE_AREA)
+    {
+        LLStringUtil::format_map_t args;
+        args["PIXELS"] = llformat("%dM", (S32)(MAX_IMAGE_AREA / 1000000));
+
+        mImageLoadError = LLTrans::getString("texture_load_area_error", args);
+        return false;
+    }
+
     // Load the image
     LLPointer<LLImageFormatted> image = LLImageFormatted::createFromType(codec);
     if (image.isNull())