livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

viewer#1666 Make warning universal to avoid shifting notification

master
Andrey Kleshchev 2024-07-02 21:10:48 +03:00 committed by Andrey Kleshchev
parent 1adb94a89c
commit b63065486b
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloaterbulkupload.cpp
View File

@ -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);

2
indra/newview/skins/default/xui/en/floater_bulk_upload.xml
View File

@ -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