From 8e5b453ea05ca3d53997b1fc2f0f4fcf65de9857 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Tue, 29 Dec 2009 16:12:12 -0800 Subject: EXT-3589 Favorites Appear Squished Together on Left Half of Favorites Bar EXT-3602 Inventory > New Clothes sub menu not aligned EXT-3631 Texture preview after upload > Image covers buttons reviewed by James --- indra/newview/llpreviewtexture.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'indra/newview/llpreviewtexture.cpp') diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index 26368fb0a8..a857e30d4f 100644 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -419,12 +419,10 @@ void LLPreviewTexture::updateDimensions() view_height += info_height; S32 button_height = 0; - if (mShowKeepDiscard || mCopyToInv) { //mCopyToInvBtn - - // add space for buttons - view_height += (BTN_HEIGHT + CLIENT_RECT_VPAD) * 3; - button_height = (BTN_HEIGHT + PREVIEW_PAD) * 3; - } + + // add space for buttons + view_height += (BTN_HEIGHT + CLIENT_RECT_VPAD) * 3; + button_height = (BTN_HEIGHT + PREVIEW_PAD) * 3; view_width = llmax(view_width, getMinWidth()); view_height = llmax(view_height, getMinHeight()); -- cgit v1.2.3