summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterbulkupload.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterbulkupload.cpp')
-rw-r--r--indra/newview/llfloaterbulkupload.cpp5
1 files changed, 1 insertions, 4 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);