SH-1035 Model preview background color should match spec

4 files changed, 18 insertions, 12 deletions

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index dde470693c..7d42c842e8 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -603,13 +603,13 @@ void LLFloaterModelPreview::draw()
 		gGL.begin( LLRender::QUADS );
 		{
 			gGL.texCoord2f(0.f, 1.f);
-			gGL.vertex2i(mPreviewRect.mLeft, mPreviewRect.mTop);
+			gGL.vertex2i(mPreviewRect.mLeft, mPreviewRect.mTop-1);
 			gGL.texCoord2f(0.f, 0.f);
 			gGL.vertex2i(mPreviewRect.mLeft, mPreviewRect.mBottom);
 			gGL.texCoord2f(1.f, 0.f);
-			gGL.vertex2i(mPreviewRect.mRight, mPreviewRect.mBottom);
+			gGL.vertex2i(mPreviewRect.mRight-1, mPreviewRect.mBottom);
 			gGL.texCoord2f(1.f, 1.f);
-			gGL.vertex2i(mPreviewRect.mRight, mPreviewRect.mTop);
+			gGL.vertex2i(mPreviewRect.mRight-1, mPreviewRect.mTop-1);
 		}
 		gGL.end();
 
@@ -3798,7 +3798,7 @@ BOOL LLModelPreview::render()
 		gGL.pushMatrix();
 		glLoadIdentity();
 
-		gGL.color4f(0.15f, 0.2f, 0.3f, 1.f);
+		gGL.color4f(0.169f, 0.169f, 0.169f, 1.f);
 
 		gl_rect_2d_simple( width, height );
 
diff --git a/indra/newview/llfloatermodelwizard.cpp b/indra/newview/llfloatermodelwizard.cpp
index 095499e6b0..be43216b0e 100644
--- a/indra/newview/llfloatermodelwizard.cpp
+++ b/indra/newview/llfloatermodelwizard.cpp
@@ -485,6 +485,7 @@ BOOL LLFloaterModelWizard::postBuild()
 	getChild<LLUICtrl>("back")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onClickBack, this));
 	getChild<LLUICtrl>("next")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onClickNext, this));
 	getChild<LLUICtrl>("preview_lod_combo")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onPreviewLODCommit, this, _1));
+	getChild<LLUICtrl>("preview_lod_combo2")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onPreviewLODCommit, this, _1));
 	getChild<LLUICtrl>("accuracy_slider")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onAccuracyPerformance, this, _2));
 	getChild<LLUICtrl>("upload")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onUpload, this));
 	getChild<LLUICtrl>("physics_slider")->setCommitCallback(boost::bind(&LLFloaterModelWizard::onPhysicsChanged, this));
@@ -630,17 +631,17 @@ void LLFloaterModelWizard::draw()
 		
 		LLRect item_rect;
 		preview_panel->localRectToOtherView(preview_panel->getLocalRect(), &item_rect, this);
-		
+	
 		gGL.begin( LLRender::QUADS );
 		{
 			gGL.texCoord2f(0.f, 1.f);
-			gGL.vertex2i(item_rect.mLeft, item_rect.mTop);
+			gGL.vertex2i(item_rect.mLeft, item_rect.mTop-1);
 			gGL.texCoord2f(0.f, 0.f);
 			gGL.vertex2i(item_rect.mLeft, item_rect.mBottom);
 			gGL.texCoord2f(1.f, 0.f);
-			gGL.vertex2i(item_rect.mRight, item_rect.mBottom);
+			gGL.vertex2i(item_rect.mRight-1, item_rect.mBottom);
 			gGL.texCoord2f(1.f, 1.f);
-			gGL.vertex2i(item_rect.mRight, item_rect.mTop);
+			gGL.vertex2i(item_rect.mRight-1, item_rect.mTop-1);
 		}
 		gGL.end();
 		
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 201e971f4c..8a18861e1a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -58,6 +58,9 @@
   <panel
     name="preview_panel"
     left="15"
+    bevel_style="none"
+    border_style="line"
+    border="true"
     width="290"
     height="290"
     follows="all"/>
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 2377a9e4ef..f133d75eee 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -101,7 +101,7 @@
 		 height="388"
 		 top_pad="0"
 		 name="choose_file_panel"
-		 visible="false"
+		 visible="true"
 		 width="530"
 		 left="0">
 		<panel
@@ -196,7 +196,7 @@
 			 top_pad="0"
 			 name="preview_panel"
 			 bevel_style="none"
-			 border_style="line"
+			 highlight_light_color="0.09 0.09 0.09 1"
 			 border="true"
 			 height="150"
 			 follows="all"
@@ -395,7 +395,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 				Model Preview:
 			</text>
 			<combo_box left_pad="5" top_delta="-2"  follows="left|top" list_position="below" height="18"
-	     name="preview_lod_combo" width="90" tool_tip="LOD to view in preview render">
+	     name="preview_lod_combo2" width="90" tool_tip="LOD to view in preview render">
 				<combo_item name="high">
 					High
 				</combo_item>
@@ -414,6 +414,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 				 top_pad="5"
 				 name="preview_panel"
 				 bevel_style="none"
+				 highlight_light_color="0.09 0.09 0.09 1"
 				 border_style="line"
 				 border="true"
 				 height="175"
@@ -600,7 +601,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		 height="388"
 		 top_delta="0"
 		 name="review_panel"
-		 visible="true"
+		 visible="false"
 		 width="530"
 		 left="0">
 		<panel
@@ -670,6 +671,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 				 top_pad="10"
 				 name="preview_panel"
 				 bevel_style="none"
+				 highlight_light_color="0.09 0.09 0.09 1"
 				 border_style="line"
 				 border="true"
 				 height="190"