From 3de1f3e59e54d88ee5cff9607d9eebe9eb9950b5 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 23 Feb 2019 20:05:29 +0200
Subject: [PATCH] Backed out changeset: ce6ac58d801c
---
indra/newview/app_settings/settings.xml | 2 +-
indra/newview/llfloatermodelpreview.cpp | 19 ++-----------------
.../default/xui/en/floater_model_preview.xml | 8 +++++---
3 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8f7c4601e83..5f6bfec842d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8053,7 +8053,7 @@
<key>PreviewRenderSize</key>
<map>
<key>Comment</key>
- <string>Resolution of the image rendered for the mesh upload preview (must be a power of 2)</string>
+ <string>Resolution of the image rendered for the mesh upload preview</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 616bee84fdc..79b9df2fa6b 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));
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 274e6e6c7ac..a07fe99aef1 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1490,6 +1490,7 @@ Analysed:
name="right_panel"
top="0"
left="640"
+ background_visible="true"
width="375">
<text
follows="left|top"
@@ -1509,6 +1510,7 @@ Analysed:
name="right_upper_panel"
top="8"
left="60"
+ background_visible="true"
width="315">
<combo_box
top_pad="3"
@@ -1584,7 +1586,7 @@ Analysed:
layout="topleft"
left="2"
name="physics_explode_label"
- bottom_pad="2"
+ top="85"
width="150">
Preview Spread:
</text>
@@ -1592,8 +1594,8 @@ Analysed:
name="physics_explode"
follows="right|bottom"
valign="center"
- left="105"
- top_delta="-3"
+ top="15"
+ left="80"
min_val="0.0"
max_val="3.0"
height="20"
--
GitLab