summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-02-23 20:05:29 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-02-23 20:05:29 +0200
commit3de1f3e59e54d88ee5cff9607d9eebe9eb9950b5 (patch)
tree289b04c199e1eb852834100b0a854f88947fe583 /indra/newview/llfloatermodelpreview.cpp
parent54b444c5d5e4e7ee80801e5eeed6b32227096580 (diff)
Backed out changeset: ce6ac58d801c
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
-rw-r--r--indra/newview/llfloatermodelpreview.cpp19
1 files changed, 2 insertions, 17 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 616bee84fd..79b9df2fa6 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -427,23 +427,8 @@ void LLFloaterModelPreview::initModelPreview()
{
delete mModelPreview;
}
-
- S32 tex_width = 512;
- S32 tex_height = 512;
-
- S32 max_width = llmin(gSavedSettings.getS32("PreviewRenderSize"), (S32)gPipeline.mScreenWidth);
- S32 max_height = llmin(gSavedSettings.getS32("PreviewRenderSize"), (S32)gPipeline.mScreenHeight);
-
- while ((tex_width << 1) <= max_width)
- {
- tex_width <<= 1;
- }
- while ((tex_height << 1) <= max_height)
- {
- tex_height <<= 1;
- }
-
- mModelPreview = new LLModelPreview(tex_width, tex_height, this);
+ auto size = gSavedSettings.getS32("PreviewRenderSize");
+ mModelPreview = new LLModelPreview(size, size, this );
mModelPreview->setPreviewTarget(16.f);
mModelPreview->setDetailsCallback(boost::bind(&LLFloaterModelPreview::setDetails, this, _1, _2, _3, _4, _5));
mModelPreview->setModelUpdatedCallback(boost::bind(&LLFloaterModelPreview::toggleCalculateButton, this, _1));