From b63065486b6e24a8518f95b95e0a5ca91a3eec28 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 2 Jul 2024 21:10:48 +0300
Subject: viewer#1666 Make warning universal to avoid shifting notification

---
 indra/newview/llfloaterbulkupload.cpp                      | 5 +----
 indra/newview/skins/default/xui/en/floater_bulk_upload.xml | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llfloaterbulkupload.cpp b/indra/newview/llfloaterbulkupload.cpp
index 98875ee84d..b898cb28b6 100644
--- a/indra/newview/llfloaterbulkupload.cpp
+++ b/indra/newview/llfloaterbulkupload.cpp
@@ -98,16 +98,13 @@ void LLFloaterBulkUpload::update()
 
     mCheckboxPanel->setVisible(mHas2kTextures);
     mLinkPanel->setVisible(mHas2kTextures);
-    mWarningPanel->setVisible(mAllow2kTextures);
+    mWarningPanel->setVisible(mHas2kTextures);
 
     S32 new_height = MAX_HEIGH;
     if (!mHas2kTextures)
     {
         new_height -= mCheckboxPanel->getRect().getHeight();
         new_height -= mLinkPanel->getRect().getHeight();
-    }
-    if (!mAllow2kTextures)
-    {
         new_height -= mWarningPanel->getRect().getHeight();
     }
     reshape(getRect().getWidth(), new_height, false);
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_upload.xml b/indra/newview/skins/default/xui/en/floater_bulk_upload.xml
index 4c639a7c65..b2d03a5d04 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_upload.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_upload.xml
@@ -55,7 +55,7 @@
              height="30"
              right="-20"
              wrap="true">
-                Because of their dimentions one or more selected textures will be scaled to 2048px.
+                By default, one or more selected textures will be scaled to 2048px.
             </text>
         </layout_panel>
         <layout_panel
-- 
cgit v1.2.3