diff options
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
| -rw-r--r-- | indra/newview/llpreviewtexture.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index bdcde60f46..e94e323850 100644 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -288,7 +288,7 @@ void LLPreviewTexture::draw() // virtual -BOOL LLPreviewTexture::canSaveAs() +BOOL LLPreviewTexture::canSaveAs() const { return mIsCopyable && !mLoadingFullImage && mImage.notNull() && !mImage->isMissingAsset(); } @@ -421,6 +421,9 @@ void LLPreviewTexture::updateDimensions() view_height += BTN_HEIGHT + CLIENT_RECT_VPAD; button_height = BTN_HEIGHT + PREVIEW_PAD; } + + view_width = llmax(view_width, getMinWidth()); + view_height = llmax(view_height, getMinHeight()); if (client_height != mLastHeight || client_width != mLastWidth) { |