diff options
| author | callum <none@none> | 2009-11-10 15:51:41 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-11-10 15:51:41 -0800 |
| commit | c50072b5482bea46f62931e075f811fbce92293d (patch) | |
| tree | f76f50b8d3327e270df511d56d7da9482f903010 /indra/newview/llpreviewtexture.cpp | |
| parent | 0eaf4b2bb27eec073d39bb6134193be905d8b6a9 (diff) | |
| parent | 5f5a5b12eda3f9bd7c2c86961dbe1753c1f21f0b (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
| -rw-r--r-- | indra/newview/llpreviewtexture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index 3eab13fc4a..13d02b7dec 100644 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -394,8 +394,8 @@ void LLPreviewTexture::updateDimensions() S32 client_height = image_height; S32 horiz_pad = 2 * (LLPANEL_BORDER_WIDTH + PREVIEW_PAD) + PREVIEW_RESIZE_HANDLE_SIZE; S32 vert_pad = PREVIEW_HEADER_SIZE + 2 * CLIENT_RECT_VPAD + LLPANEL_BORDER_WIDTH; - S32 max_client_width = gViewerWindow->getWindowWidth() - horiz_pad; - S32 max_client_height = gViewerWindow->getWindowHeight() - vert_pad; + S32 max_client_width = gViewerWindow->getWindowWidthScaled() - horiz_pad; + S32 max_client_height = gViewerWindow->getWindowHeightScaled() - vert_pad; if (mAspectRatio > 0.f) { |