diff options
| author | James Cook <james@lindenlab.com> | 2009-12-29 17:14:50 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-29 17:14:50 -0800 |
| commit | 180ffcf263b81173ae7dcac0ce9abdb10c621e46 (patch) | |
| tree | 04654bf2fdf90dcc5f3a1efdf801021b6075b343 /indra/newview/llpreviewtexture.cpp | |
| parent | b3d0c94ee0e79a6cd8ee594ec129b0215c56794a (diff) | |
| parent | 8e5b453ea05ca3d53997b1fc2f0f4fcf65de9857 (diff) | |
Merge
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()); |