diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-01-04 13:49:31 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-01-04 13:49:31 +0200 |
| commit | 516e2674f54d400c30bf548ea1e9b0a268bd929f (patch) | |
| tree | e84abb6ea06cde6db9e878fc8d78a6e0b54eed1e /indra/newview/llpreviewtexture.cpp | |
| parent | ed1eb29c7e329fa4de31fdad4272348059462d73 (diff) | |
| parent | 32657e37ab14e3ea4b5ff719e147fd720e895d77 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
| -rw-r--r-- | indra/newview/llpreviewtexture.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
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()); |