diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-18 17:35:28 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-18 17:35:28 -0500 |
| commit | 4964ca39f14531630ffbfece593f8ba9cdc86e4e (patch) | |
| tree | 777a7f43350a295f2e5cb1c0d3e200a3b02b947e | |
| parent | 0e729489438898d0de062ea5d744be3009e47c57 (diff) | |
EXT-2703: tex preview bug ui/buttons weren't visible or would appear off floater
| -rw-r--r-- | indra/newview/llpreviewtexture.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_preview_texture.xml | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index 26694ac433..26368fb0a8 100644 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -422,8 +422,8 @@ void LLPreviewTexture::updateDimensions() if (mShowKeepDiscard || mCopyToInv) { //mCopyToInvBtn // add space for buttons - view_height += BTN_HEIGHT + CLIENT_RECT_VPAD; - button_height = BTN_HEIGHT + PREVIEW_PAD; + view_height += (BTN_HEIGHT + CLIENT_RECT_VPAD) * 3; + button_height = (BTN_HEIGHT + PREVIEW_PAD) * 3; } view_width = llmax(view_width, getMinWidth()); diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index abc30c335c..552902d1d9 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -4,13 +4,13 @@ auto_tile="true" can_resize="true" follows="left|top" - height="313" + height="350" layout="topleft" - min_height="120" - min_width="320" + min_height="200" + min_width="370" name="preview_texture" help_topic="preview_texture" - width="320"> + width="370"> <floater.string name="Title"> Texture: [NAME] |