diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index eebeb53cdbab8011529ddecb71f6d0ff32e68f36..0b7c011861f372a9af7c121dd622a48c67d4669e 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -4524,7 +4524,7 @@ void LLModelPreview::setPreviewLOD(S32 lod)
combo_box2->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order
LLComboBox* combo_box3 = mFMP->getChild<LLComboBox>("preview_lod_combo3");
- combo_box2->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order
+ combo_box3->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order
LLColor4 highlight_color = LLUIColorTable::instance().getColor("MeshImportTableHighlightColor");
LLColor4 normal_color = LLUIColorTable::instance().getColor("MeshImportTableNormalColor");
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 a6dd6c099da91a49e8291266e00cbb6f71f8bd24..93740007eeecba29a3a76416c323304372b3fc60 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -5,10 +5,10 @@
name="Model Wizard"
help_topic="model_wizard"
bg_opaque_image_overlay="0.5 0.5 0.5 1"
- height="475"
+ height="480"
save_rect="true"
title="UPLOAD MODEL WIZARD"
- width="530">
+ width="535">
<button
top="32"
tab_stop="false"
@@ -120,22 +120,23 @@
top_pad="0"
name="choose_file_panel"
visible="false"
- width="530"
+ width="535"
left="0">
<panel
- height="20"
- top_pad="20"
- width="500"
+ height="22"
+ top_pad="15"
+ width="505"
name="header_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
- left="20">
+ left="15">
<text
width="200"
left="10"
- top="2"
+ top="3"
name="header_text"
+ text_color="White"
height="10"
font="SansSerifBig"
layout="topleft">
@@ -150,14 +151,14 @@
font="SansSerifSmall"
layout="topleft"
word_wrap="true"
- left_delta="0">
+ left_delta="5">
This wizard will help you import mesh models to Second Life. First specify a file containing the model you wish to import. Second Life supports COLLADA (.dae) files.
</text>
<panel
top_delta="40"
left="15"
- height="245"
- width="500"
+ height="270"
+ width="505"
name="content"
bg_opaque_color="DkGray2"
background_visible="true"
@@ -290,23 +291,24 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
height="388"
top_delta="0"
name="optimize_panel"
- visible="false"
- width="530"
+ visible="true"
+ width="535"
left="0">
<panel
- height="20"
- top_pad="20"
+ height="22"
+ top_pad="15"
name="header_panel"
- width="500"
+ width="505"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
- left="20">
+ left="15">
<text
width="200"
left="10"
name="header_text"
- top="2"
+ top="3"
+ text_color="White"
height="10"
font="SansSerifBig"
layout="topleft">
@@ -321,15 +323,15 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
layout="topleft"
name="description"
word_wrap="true"
- left_delta="0">
- This wizard is optimizing your model. This may take several minutes. To stop the process click the back button
+ left_delta="5">
+ This wizard has optimized your model to improve performance. You may adjust the results of the optimization process bellow or click Next to continue.
</text>
<panel
top_delta="40"
visible="false"
left="15"
- height="245"
- width="500"
+ height="270"
+ width="505"
name="content"
bg_opaque_color="DkGray2"
background_visible="true"
@@ -403,8 +405,8 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
<panel
top_delta="0"
left_delta="0"
- height="245"
- width="500"
+ height="270"
+ width="505"
name="content2"
bg_opaque_color="DkGray2"
background_visible="true"
@@ -412,7 +414,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
<text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">
Model Preview:
</text>
- <combo_box left_pad="5" top_delta="-2" follows="left|top" list_position="below" height="18"
+ <combo_box left_pad="5" top_delta="-5" follows="left|top" list_position="below" height="22"
name="preview_lod_combo2" width="90" tool_tip="LOD to view in preview render">
<combo_item name="high">
High
@@ -435,27 +437,27 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
highlight_light_color="0.09 0.09 0.09 1"
border_style="line"
border="true"
- height="175"
+ height="185"
follows="all"
- width="175">
+ width="185">
</panel>
- <text top="35" left="220" text_color="White" font="SansSerifSmallBold" width="300" height="4">Performance</text>
- <text top="55" left="200" halign="center" width="130" word_wrap="true" font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text>
- <text top="35" left="380" text_color="White" font="SansSerifSmallBold" width="300" height="4">Accuracy</text>
- <text top="55" left="360" halign="center" width="130" word_wrap="true" font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text>
+ <text top="45" left="224" text_color="White" font="SansSerifSmallBold" width="300" height="4">Performance</text>
+ <text top="65" left="204" halign="center" width="130" word_wrap="true" font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text>
+ <text top="45" left="384" text_color="White" font="SansSerifSmallBold" width="300" height="4">Accuracy</text>
+ <text top="65" left="364" halign="center" width="130" word_wrap="true" font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text>
<slider
follows="left|top"
height="20"
increment="1"
layout="topleft"
- left="200"
+ left="204"
max_val="2"
initial_value="1"
min_val="0"
name="accuracy_slider"
show_text="false"
- top="105"
+ top="120"
width="290" />
<text
font="SansSerifSmall"
@@ -466,14 +468,14 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
<icon
- top_pad="10"
+ top_pad="14"
left_delta="0"
width="280"
height="2"
image_name="model_wizard\divider_line.png"/>
- <text top_delta="25" width="200" text_color="White" left_delta="50" name="streaming cost" height="20">Resource Cost: [COST]</text>
- <text top_delta="25" width="100" text_color="White" left_delta="0" height="20">Upload Fee:</text>
+ <text top_delta="20" width="200" text_color="White" left_delta="50" name="streaming cost" height="20">Resource Cost: [COST]</text>
+ <text top_delta="24" width="100" text_color="White" left_delta="0" height="20">Upload Fee:</text>
<text
top_pad="5"
width="130"
@@ -527,44 +529,45 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
top_delta="0"
name="physics_panel"
visible="false"
- width="530"
+ width="535"
left="0">
<panel
- height="20"
- top_pad="20"
+ height="22"
+ top_pad="15"
name="header_panel"
- width="500"
+ width="505"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
- left="20">
+ left="15">
<text
width="200"
left="10"
name="header_text"
- top="2"
+ top="3"
height="10"
font="SansSerifBig"
+ text_color="White"
layout="topleft">
Physics
</text>
</panel>
<text
- top_pad="14"
- width="460"
+ top_pad="10"
+ width="474"
height="50"
font="SansSerifSmall"
layout="topleft"
name="description"
word_wrap="true"
- left_delta="0">
+ left_delta="5">
The wizard will create a physical shape, which determines how the object interacts with other objects and avatars. Set the slider to the detail level most appropriate for how your object will be used:
</text>
<panel
- top_delta="40"
+ top_delta="44"
left="15"
- height="265"
- width="500"
+ height="270"
+ width="505"
name="content"
bg_opaque_color="DkGray2"
background_visible="true"
@@ -616,23 +619,24 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
height="388"
top_delta="0"
name="physics2_panel"
- visible="true"
- width="530"
+ visible="false"
+ width="535"
left="0">
<panel
- height="20"
- top_pad="20"
+ height="22"
+ top_pad="15"
name="header_panel"
- width="500"
+ width="505"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
- left="20">
+ left="15">
<text
width="200"
left="10"
name="header_text"
- top="2"
+ text_color="White"
+ top="3"
height="10"
font="SansSerifBig"
layout="topleft">
@@ -641,20 +645,20 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
</panel>
<text
top_pad="14"
- width="460"
+ width="475"
height="50"
font="SansSerifSmall"
layout="topleft"
name="description"
word_wrap="true"
- left_delta="0">
- Preview the physics shpae below then click Next to continue. To modify the physics shape, click the Back button.
+ left_delta="5">
+ Preview the physics shape below then click Next to continue. To modify the physics shape, click the Back button.
</text>
<panel
top_delta="40"
left="15"
- height="265"
- width="500"
+ height="270"
+ width="505"
name="content"
bg_opaque_color="DkGray2"
background_visible="true"
@@ -734,7 +738,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
height="15"
name="dimension_z"
left_delta="46"/>
- <text top="140" width="180" text_color="White" left="240" name="streaming cost" height="20">Resource Cost: [COST]</text>
+ <text top="40" width="180" text_color="White" left="225" name="streaming cost" height="20">Resource Cost: [COST]</text>
<text top_delta="26" width="180" text_color="White" left_delta="0" name="physics cost" height="20">Physics Cost: [COST]</text>
<text top_delta="26" width="180" text_color="White" left_delta="0" height="20">Upload Fee:</text>
@@ -746,17 +750,17 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
top_delta="0"
name="review_panel"
visible="false"
- width="530"
+ width="535"
left="0">
<panel
height="22"
- top_pad="16"
+ top_pad="15"
name="header_panel"
- width="500"
+ width="505"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
- left="20">
+ left="15">
<text
width="200"
left="10"
@@ -771,13 +775,13 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
</panel>
<text
top_pad="14"
- width="460"
+ width="470"
height="24"
font="SansSerifSmall"
layout="topleft"
name="description"
word_wrap="true"
- left_delta="10">
+ left_delta="5">
Review the details below then click. Upload to upload your model. Your L$ balance will be charged when you click Upload.
</text>
<icon
@@ -789,8 +793,8 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
<panel
top_pad="5"
left="15"
- height="245"
- width="500"
+ height="270"
+ width="505"
name="content">
<text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">
Model Preview:
@@ -935,22 +939,22 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
top_delta="0"
name="upload_panel"
visible="false"
- width="530"
+ width="535"
left="0">
<panel
- height="20"
- top_pad="20"
+ height="22"
+ top_pad="15"
name="header_panel"
- width="500"
+ width="505"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
- left="20">
+ left="15">
<text
width="200"
left="10"
name="header_text"
- top="2"
+ top="3"
text_color="White"
height="10"
font="SansSerifBig"
@@ -960,13 +964,13 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
</panel>
<text
top_pad="14"
- width="460"
+ width="474"
height="20"
font="SansSerifSmall"
layout="topleft"
name="description"
word_wrap="true"
- left_delta="0">
+ left_delta="5">
Congratulations! Your model has been sucessfully uploaded. You will find the model in the Objects folder in your inventory.
</text>
<icon