diff options
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_model_preview.xml | 369 |
1 files changed, 255 insertions, 114 deletions
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 5a86eb06fb..e073268b0a 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -2,12 +2,12 @@ <floater can_close="true" can_drag_on_left="false" - can_minimize="false" - can_resize="false" - height="480" - min_height="480" - width="980" - min_width="980" + can_minimize="true" + can_resize="true" + height="600" + min_height="600" + width="1024" + min_width="1024" name="Model Preview" title="UPLOAD MODEL" help_topic="upload_model" > @@ -33,19 +33,21 @@ <string name="mesh_status_missing_lod">Missing required level of detail.</string> <string name="mesh_status_invalid_material_list">LOD materials are not a subset of reference model.</string> <string name="phys_status_vertex_limit_exceeded">Some physical hulls exceed vertex limitations.</string> + <string name="phys_status_degenerate_triangles">The physics mesh too dense remove the small thin triangles (see preview)</string> + <string name="phys_status_no_havok">The Firestorm OpenSim build is not supported for physics upload in SL.</string> <string name="layer_all">All</string> <!-- Text to display in physics layer combo box for "all layers" --> <string name="decomposing">Analyzing...</string> <string name="simplifying">Simplifying...</string> <string name="tbd">TBD</string> -<panel - follows="top|left" - height="455" - layout="topleft" - left="3" - name="left_panel" - top_pad="10" - width="630"> + <panel + follows="top|left" + height="580" + layout="topleft" + left="3" + name="left_panel" + top_pad="0" + width="630"> <panel follows="all" height="50" @@ -755,8 +757,9 @@ name="first_step_name" text_color="White" top_pad="0" - width="210"> - Step 1: Level of Detail + width="210" + valign="center"> + Step 1: Pick a physics model : </text> <combo_box follows="left|top" @@ -798,7 +801,7 @@ layout="topleft" left="18" name="physics_tab_border" - top_pad="15" + top_pad="10" width="589"/> <panel bg_alpha_color="0 0 0 0" @@ -807,7 +810,7 @@ follows="top|left" left="18" name="physics analysis" - top_pad="15" + top_pad="10" visible="true" width="589"> <text @@ -819,7 +822,7 @@ name="method_label" text_color="White" top_pad="0"> - Step 2: Analyze + Step 2: Convert to hulls (optional) </text> <text follows="top|left" @@ -905,7 +908,7 @@ layout="topleft" left="18" name="physics_tab_border" - top_pad="15" + top_pad="10" width="589"/> <panel bg_alpha_color="0 0 0 0" @@ -914,7 +917,7 @@ height="66" left="18" name="physics simplification" - top_pad="15" + top_pad="10" width="589"> <text text_color="White" @@ -1013,7 +1016,7 @@ layout="topleft" left="18" name="physics_tab_border" - top_pad="15" + top_pad="10" width="589"/> <panel bg_alpha_color="0 0 0 0" @@ -1075,10 +1078,9 @@ follows="left|top" height="19" layout="topleft" - left_pad="5" - top_delta="0" + top_pad="5" name="physics message" - width="270"> + width="589"> <icon follows="left|top" height="16" @@ -1093,7 +1095,7 @@ layout="topleft" left_pad="2" name="physics_status_message_text" - width="252" + width="573" top_delta="3"/> </panel> </panel> @@ -1219,13 +1221,14 @@ </panel> </tab_container> <panel - follows="top|left" - height="80" - layout="top|left" - left="0" + follows="top|left|bottom" + layout="topleft" + height="184" + left="4" + border="true" name="weights_and_warning_panel" top_pad="3" - width="625"> + width="629"> <button follows="top|left" label="Calculate weights & fee" @@ -1265,10 +1268,10 @@ label_color="White" layout="topleft" name="reset_btn" - right="-2" + right="-5" top="3" height="20" - width="275"/> + width="265"/> <!-- ========== WEIGHTS ==========--> <text follows="top|left" @@ -1287,7 +1290,7 @@ left_pad="0" name="prim_weight" top_delta="0" - width="120" + width="130" word_wrap="true"> Land impact: [EQ] </text> @@ -1297,7 +1300,7 @@ left_pad="0" name="download_weight" top_delta="0" - width="100" + width="130" word_wrap="true"> Download: [ST] </text> @@ -1307,7 +1310,7 @@ layout="topleft" left_pad="0" name="physics_weight" - width="90" + width="130" word_wrap="true"> Physics: [PH] </text> @@ -1317,17 +1320,148 @@ layout="topleft" left_pad="0" name="server_weight" - width="83" + width="130" word_wrap="true"> Server: [SIM] </text> - <!-- ========== NOTE MESSAGE ========== --> + <!-- =========== Cost breakdown ======== --> + <panel + border="true" + top_pad="5" + layout="topleft" + left="6" + name="price_breakdown_panel" + width="120" + height="100"> + <text + layout="topleft" + left="3"> + Price Breakdown + </text> + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + left="3" + name="price_breakdown_border" + top_pad="5" + width="110"/> + <text + height="80" + top_pad="5" + layout="topleft" + left="3" + name="price_breakdown_labels" + width="70" + word_wrap="false"> +Download: +Physics: +Instances: +Textures: +Model: + </text> + <text + height="80" + top_delta="0" + layout="topleft" + halign="right" + left_pad="0" + name="price_breakdown" + width="40" + word_wrap="false"> +[STREAMING] +[PHYSICS] +[INSTANCES] +[TEXTURES] +[MODEL] + </text> + </panel> + <!-- + Streaming breakdown numbers are available but not fully understood + uncommenting the following sections will display the numbers for debugging purposes + <text + height="80" + top_delta="0" + layout="topleft" + left="130" + name="streaming_breakdown_labels" + width="65" + word_wrap="true"> +Streaming/Download: +High: +Medium: +Low: +Lowest: + </text> <text + height="80" + top_delta="0" + layout="topleft" + left_pad="0" + name="streaming_breakdown" + width="95" + word_wrap="true"> +[STR_TOTAL] +[STR_HIGH] +[STR_MED] +[STR_LOW] +[STR_LOWEST] + </text>--> + <panel + border="true" + layout="topleft" + left_pad="265" + name="price_breakdown_panel" + width="120" + height="100"> + <text + layout="topleft" + left="3"> + Physics Costs + </text> + <view_border + bevel_style="none" + follows="top|left" + height="0" + layout="topleft" + left="3" + name="price_breakdown_border" + top_pad="5" + width="110"/> + <text + height="80" + top_pad="5" + layout="topleft" + left="5" + name="physics_breakdown_labels" + width="65"> +Base Hull: +Mesh: +Analysed: + </text> + <text + height="80" + top_delta="0" + layout="topleft" + left_pad="0" + name="physics_breakdown" + width="40" + halign="right" + word_wrap="false" + visible="true"> +[PCH] +[PM] +[PHU] + </text>--> + </panel> + <!-- ========== NOTE MESSAGE ========== --> + <text font="SansSerif" layout="topleft" left="6" name="warning_title" - top_pad="10" + top_pad="5" text_color="DrYellow" visible="false" width="40"> @@ -1346,104 +1480,110 @@ visible="false"> You dont have rights to upload mesh models. [[VURL] Find out how] to get certified. </text> - <text text_color="Yellow" layout="topleft" top_delta="20" left="6" name="status">[STATUS]</text> - + <text text_color="Yellow" layout="topleft" top_delta="5" left="6" name="status"> +[STATUS] + </text> </panel> -</panel> - -<text - follows="left|top" - layout="topleft" - left="640" - name="lod_label" - text_color="White" - top="13" - height="15" - width="290"> - Preview: - </text> -<panel - border="true" - bevel_style="none" - follows="top|left" - name="preview_panel" - top_pad="4" - width="290" - height="290"/> - -<panel - follows="all" - height="130" - layout="topleft" - name="right_panel" - top_pad="5" - width="340"> - <combo_box - top_pad="3" + </panel> + <panel + follows="top|left|bottom|right" + can_resize="true" + name="right_panel" + top="0" + left="640" + background_visible="true" + width="375"> + <text follows="left|top" - height="18" layout="topleft" - name="preview_lod_combo" - width="150" - tool_tip="LOD to view in preview render"> + left="0" + name="lod_label" + text_color="White" + top="13" + height="15" + width="290"> + Preview: + </text> + <panel + can_resize="false" + follows="top|left" + height="20" + name="right_upper_panel" + top="8" + left="60" + background_visible="true" + width="315"> + <combo_box + top_pad="3" + can_resize="false" + follows="top|left" + height="18" + layout="topleft" + name="preview_lod_combo" + width="75" + tool_tip="LOD to view in preview render"> <combo_item name="high"> High </combo_item> <combo_item name="medium"> Medium </combo_item> <combo_item name="low"> Low </combo_item> <combo_item name="lowest"> Lowest </combo_item> - </combo_box> - <text - follows="top|left" - layout="topleft" - text_color="White" - top="5" - left_pad="20" - name="label_display" - width="50"> - Display... - </text> - <check_box - follows="top|left" - label="Edges" + </combo_box> + </panel> + </panel> + <panel + border="true" + bevel_style="none" + follows="top|left|right|bottom" + layout="topleft" + name="preview_panel" + top="30" + width="375" + height="525"/> + + <panel + follows="left|right|bottom" + layout="topleft" + height="40" + name="lower_right_panel" + top_pad="5" + width="375"> + <check_box + follows="right|bottom" + label="Edges" label_text.text_color="White" layout="topleft" - left_delta="0" name="show_edges" - top_pad="8"> - </check_box> + width="70" + left="0" + top_pad="8"/> <check_box - follows="top|left" + follows="right|bottom" + left_pad="8" label="Physics" label_text.text_color="White" - layout="topleft" - name="show_physics" - top_pad="8"> - </check_box> + name="show_physics"/> <check_box - follows="top|left" + follows="right|bottom" label="Textures" label_text.text_color="White" layout="topleft" name="show_textures" - top_pad="8"> - </check_box> + left_pad="0"/> <check_box - follows="top|left" - label="Skin weights" + follows="right|bottom" + label="Weights" label_text.text_color="White" layout="topleft" name="show_skin_weight" - top_pad="8"> - </check_box> + left_pad="0"/> <check_box - follows="top|left" + follows="right|bottom" label="Joints" label_text.text_color="White" layout="topleft" name="show_joint_positions" - top_pad="8"> - </check_box> + left_pad="0"/> <text - follows="top|left" + follows="right|bottom" layout="topleft" left="2" name="physics_explode_label" @@ -1453,12 +1593,13 @@ </text> <slider name="physics_explode" - follows="top|left" - top="100" - left="0" + follows="right|bottom" + valign="center" + top="15" + left="80" min_val="0.0" max_val="3.0" height="20" - width="150"/> -</panel> + width="120"/> + </panel> </floater> |