summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-07-02 21:10:48 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2024-07-02 21:53:43 +0300
commitb63065486b6e24a8518f95b95e0a5ca91a3eec28 (patch)
treee7c42a69039b1e84224c416a1337682387c45065 /indra
parent1adb94a89c106176e01d950170b9c4d623dd2250 (diff)
viewer#1666 Make warning universal to avoid shifting notification
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterbulkupload.cpp5
-rw-r--r--indra/newview/skins/default/xui/en/floater_bulk_upload.xml2
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