livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1540

meow-7.2.2
Oz Linden 2011-08-09 10:19:45 -04:00
parent 4405c74f71 2539f8918e
commit 554159416f
2 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/skins/default/xui/en/floater_build_options.xml
View File

@ -37,7 +37,7 @@
layout="topleft"
left="10"
tool_tip="Grid opacity"
name="grid_opacity_label"
name="grid_mode_label"
top_pad="30"
width="123">
Mode

89
indra/newview/skins/default/xui/en/floater_model_wizard.xml
View File

@ -108,7 +108,7 @@
height="22"
top_pad="15"
width="505"
name="header_panel"
name="choose_file_header_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
@ -117,7 +117,7 @@
width="200"
left="10"
top="3"
name="header_text"
name="choose_file_header_text"
text_color="White"
height="10"
font="SansSerifBig"
@ -130,7 +130,7 @@
left="15"
height="310"
width="505"
name="content"
name="choose_file_content_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
@ -163,7 +163,7 @@
height="10"
layout="topleft"
left_delta="0"
name="Cache location"
name="choose_model_file_label"
width="320">
Choose model file to upload
</text>
@ -199,7 +199,7 @@
height="10"
layout="topleft"
left="10"
name="Cache location"
name="support_collada_text"
width="320">
Second Life supports COLLADA (.dae) files
</text>
@ -221,6 +221,7 @@
width="130"
height="14"
left_delta="0"
name="dimensions_label"
text_color="White"
word_wrap="true">
Dimensions (meters):
@ -287,7 +288,7 @@
<panel
height="22"
top_pad="15"
name="header_panel"
name="optimize_header_panel"
width="505"
bg_opaque_color="DkGray2"
background_visible="true"
@ -296,7 +297,7 @@
<text
width="200"
left="10"
name="header_text"
name="optimize_header_text"
top="3"
text_color="White"
height="10"
@ -311,7 +312,7 @@
height="20"
font="SansSerifSmall"
layout="topleft"
name="description"
name="optimize_hint"
word_wrap="true"
left_delta="5">
We have optimized the model for performance. Adjust it further if you wish.
@ -322,11 +323,12 @@
left="15"
height="270"
width="505"
name="content"
name="optimize_content_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
<text
name="generating_lod_label"
top="20"
width="300"
height="12"
@ -401,12 +403,12 @@
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
<text top="69" left="10" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Performance</text>
<text top="85" left="10" width="120" word_wrap="true" font="SansSerifSmall" height="40">Faster rendering
<text name="optimize_performance_text" top="69" left="10" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Performance</text>
<text name="optimize_faster_rendering_text" top="85" left="10" width="120" word_wrap="true" font="SansSerifSmall" height="40">Faster rendering
Less detail
Lower prim weight</text>
<text top="69" left="184" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Accuracy</text>
<text top="85" left="184" width="120" word_wrap="true" font="SansSerifSmall" height="40">Slower rendering
<text name="optimize_accuracy_text" top="69" left="184" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Accuracy</text>
<text name="optimize_slower_rendering_text" top="85" left="184" width="120" word_wrap="true" font="SansSerifSmall" height="40">Slower rendering
More detail
Higher prim weight</text>
@ -424,21 +426,24 @@ Higher prim weight</text>
top="130"
width="290" />
<text
font="SansSerifSmall"
font="SansSerifSmall"
name="accuracy_slider_mark1"
top_pad="0"
width="5"
left_delta="6"
height="4">'
</text>
<text
font="SansSerifSmall"
font="SansSerifSmall"
name="accuracy_slider_mark2"
top_delta="0"
width="5"
left_delta="137"
height="4">'
</text>
<text
font="SansSerifSmall"
font="SansSerifSmall"
name="accuracy_slider_mark3"
top_delta="0"
width="5"
left_delta="137"
@ -454,7 +459,7 @@ Higher prim weight</text>
top_pad="15"
width="150">
</button>
<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="lod_label">
<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="geometry_preview_label">
Geometry preview
</text>
<panel
@ -471,16 +476,16 @@ Higher prim weight</text>
</panel>
<combo_box left_delta="75" top_pad="10" follows="left|top" list_position="below" height="22"
name="preview_lod_combo" width="110" tool_tip="LOD to view in preview render">
<combo_item name="high">
<combo_item name="preview_lod_high">
High detail
</combo_item>
<combo_item name="medium">
<combo_item name="preview_lod_medium">
Medium detail
</combo_item>
<combo_item name="low">
<combo_item name="preview_lod_low">
Low detail
</combo_item>
<combo_item name="lowest">
<combo_item name="preview_lod_lowest">
Lowest detail
</combo_item>
</combo_box>
@ -497,7 +502,7 @@ Higher prim weight</text>
<panel
height="22"
top_pad="15"
name="header_panel"
name="physics_header_panel"
width="505"
bg_opaque_color="DkGray2"
background_visible="true"
@ -506,7 +511,7 @@ Higher prim weight</text>
<text
width="200"
left="10"
name="header_text"
name="physics_header_text"
top="3"
height="10"
font="SansSerifBig"
@ -521,7 +526,7 @@ Higher prim weight</text>
height="50"
font="SansSerifSmall"
layout="topleft"
name="description"
name="physics_hint"
word_wrap="true"
left_delta="5">
We will create a shape for the outer hull of the model. Adjust the shape's detail level as needed for the intended purpose of your model.
@ -531,16 +536,16 @@ Higher prim weight</text>
left="15"
height="270"
width="505"
name="content"
name="physics_content_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
<text top="10" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Performance</text>
<text top="26" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Faster rendering
<text name="physics_performance_text" top="10" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Performance</text>
<text name="physics_faster_rendering_text" top="26" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Faster rendering
Less detail
Lower prim weight</text>
<text top="174" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Accuracy</text>
<text top="190" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Slower rendering
<text name="physics_accuracy_text" top="174" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Accuracy</text>
<text name="physics_slower_dendering_text" top="190" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Slower rendering
More detail
Higher prim weight</text>
@ -558,15 +563,15 @@ Higher prim weight</text>
show_text="false"
top="25"
width="22" />
<text top="10" width="120" word_wrap="true" left_pad="10" height="50">Examples:
<text name="physics_example_1" top="10" width="120" word_wrap="true" left_pad="10" height="50">Examples:
Moving objects
Flying objects
Vehicles</text>
<text top="95" width="120" word_wrap="true" left_delta="0" height="50">Examples:
<text name="physics_example_2" top="95" width="120" word_wrap="true" left_delta="0" height="50">Examples:
Small static objects
Less detailed objects
Simple furniture</text>
<text top="180" width="120" word_wrap="true" left_delta="0" height="50">Examples:
<text name="physics_example_3" top="180" width="120" word_wrap="true" left_delta="0" height="50">Examples:
Static objects
Detailed objects
Buildings</text>
@ -592,7 +597,7 @@ Buildings</text>
visible="false"
width="150">
</button>
<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="lod_label">
<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="physics_preview_label">
Physics preview
</text>
<panel
@ -609,16 +614,16 @@ Buildings</text>
</panel>
<combo_box left_delta="75" top_pad="10" follows="left|top" list_position="below" height="22"
name="preview_lod_combo2" width="110" tool_tip="LOD to view in preview render">
<combo_item name="high">
<combo_item name="preview_lod2_high">
High detail
</combo_item>
<combo_item name="medium">
<combo_item name="preview_lod2_medium">
Medium detail
</combo_item>
<combo_item name="low">
<combo_item name="preview_lod2_low">
Low detail
</combo_item>
<combo_item name="lowest">
<combo_item name="preview_lod2_lowest">
Lowest detail
</combo_item>
</combo_box>
@ -635,7 +640,7 @@ Buildings</text>
<panel
height="22"
top_pad="15"
name="header_panel"
name="review_header_panel"
width="505"
bg_opaque_color="DkGray2"
background_visible="true"
@ -644,7 +649,7 @@ Buildings</text>
<text
width="200"
left="10"
name="header_text"
name="review_header_text"
text_color="White"
top="3"
height="10"
@ -658,7 +663,7 @@ Buildings</text>
left="15"
height="310"
width="505"
name="content"
name="review_content_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
@ -706,7 +711,7 @@ Buildings</text>
<panel
height="22"
top_pad="15"
name="header_panel"
name="upload_header_panel"
width="505"
bg_opaque_color="DkGray2"
background_visible="true"
@ -715,7 +720,7 @@ Buildings</text>
<text
width="200"
left="10"
name="header_text"
name="upload_header_text"
top="3"
text_color="White"
height="10"