aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreviewtexture.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:37 -0500
committerJacek Antonelli2008-08-15 23:45:37 -0500
commit31ba05810c641f14e8ab5da8ad2aaf527779f6c1 (patch)
treec4b8d635dfb657fa4cfee7c285f8cadbf24afa90 /linden/indra/newview/llpreviewtexture.cpp
parentSecond Life viewer sources 1.19.1.1 (diff)
downloadmeta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.zip
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.gz
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.bz2
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.xz
Second Life viewer sources 1.19.1.2
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpreviewtexture.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llpreviewtexture.cpp b/linden/indra/newview/llpreviewtexture.cpp
index b8fa668..9f401f4 100644
--- a/linden/indra/newview/llpreviewtexture.cpp
+++ b/linden/indra/newview/llpreviewtexture.cpp
@@ -427,6 +427,9 @@ void LLPreviewTexture::updateAspectRatio()
427 view_height += BTN_HEIGHT + CLIENT_RECT_VPAD; 427 view_height += BTN_HEIGHT + CLIENT_RECT_VPAD;
428 button_height = BTN_HEIGHT + PREVIEW_PAD; 428 button_height = BTN_HEIGHT + PREVIEW_PAD;
429 } 429 }
430
431 view_width = llmax(view_width, getMinWidth());
432 view_height = llmax(view_height, getMinHeight());
430 433
431 if (client_height != mLastHeight || client_width != mLastWidth) 434 if (client_height != mLastHeight || client_width != mLastWidth)
432 { 435 {