diff options
Diffstat (limited to 'indra/newview/skins')
4 files changed, 81 insertions, 130 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml index a1140b2532..fdd00ca910 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml @@ -6,7 +6,8 @@ help_topic="day_presets" save_rect="true" title="Edit Day Cycle" - width="705"> + width="705" + can_resize="true"> <!-- obsolete?, add as hint for 'save' button? --> <string name="title_new">Create a New Day Cycle</string> @@ -434,16 +435,16 @@ tool_tip="Replace frame with settings from inventory"/> </layout_panel> <layout_panel name="frame_settings_water" - auto_resize="false" + auto_resize="true" user_resize="true" - height="351" + height="450" width="700" min_height="0" visible="false"> <tab_container follows="all" halign="left" - height="386" + height="420" layout="topleft" left="0" name="water_tabs" @@ -466,7 +467,7 @@ <layout_panel name="frame_settings_sky" auto_resize="false" user_resize="true" - height="351" + height="450" width="700" min_height="0" visible="true"> diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml index 9bd931f9fb..57658a4725 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml @@ -95,51 +95,24 @@ width="200"> Cloud Scroll: </text> - <panel + <xy_vector follows="left|top" - border="true" - bg_alpha_color="red" - background_visible="true" - width="100" - height="100" - left_delta="5" - top_delta="21"> - <text> - placeholder - </text> - <slider - decimal_digits="1" - follows="left|top" - increment="0.01" - initial_value="0" - layout="topleft" - label="X:" - left_delta="10" - max_val="10" - min_val="-10" - name="cloud_scroll_x" - top_pad="5" - width="100"/> - <slider - decimal_digits="1" - follows="left|top" - increment="0.01" - initial_value="0" - layout="topleft" - label="Y:" - left_delta="0" - max_val="10" - min_val="-10" - name="cloud_scroll_y" - top_pad="5" - orientation="vertical" - height="70"/> - </panel> + name="cloud_scroll_xy" + width="120" + height="145" + visible="true" + left_delta="0" + top_delta="21" + min_val_x="-10" + max_val_x="10" + min_val_y="-10" + max_val_y="10" /> + <text follows="left|top" height="10" layout="topleft" - left_delta="115" + left_delta="160" top_delta="-20" width="200"> Cloud Image: diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml index 59184b0f95..85d636d107 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_water.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml @@ -7,7 +7,7 @@ left="0" help_topic="land_general_tab" name="panel_settings_water" - top="0"> + top="0"> <layout_stack name="water_stack1" follows="all" layout="topleft" @@ -109,7 +109,7 @@ auto_resize="true" user_resize="true" visible="true" - min_width="375" + min_width="460" width="50"> <text follows="left|top" @@ -143,98 +143,46 @@ height="16" layout="topleft" top_delta="-20" - left_delta="120"> + left_delta="130"> Large Wave Speed </text> - <panel - follows="left|top" - border="true" - bg_alpha_color="red" - background_visible="true" - width="100" - height="100" - left_delta="0" - top_delta="21"> - <text> - placeholder - </text> - <slider - decimal_digits="1" - follows="left|top" - increment="0.01" - initial_value="0" - layout="topleft" - label="X:" - left_delta="10" - max_val="4" - min_val="-4" - name="water_wave1_x" - top_pad="5" - width="100"/> - <slider - decimal_digits="1" - follows="left|top" - increment="0.01" - initial_value="0" - layout="topleft" - label="Y:" - left_delta="0" - max_val="4" - min_val="-4" - name="water_wave1_y" - top_pad="5" - orientation="vertical" - height="70"/> - </panel> + <xy_vector + follows="top|left" + name="water_wave1_xy" + width="120" + height="145" + visible="true" + left_delta="0" + top_delta="21" + min_val_x="-4" + max_val_x="4" + increment_x="0.5f" + min_val_y="-4" + max_val_y="4" + increment_y="0.5f" + arrow_color="red"/> + <text follows="left|top" height="16" layout="topleft" top_delta="-20" - left_delta="120"> + left_delta="160"> Small Wave Speed </text> - <panel - follows="left|top" - border="true" - bg_alpha_color="red" - background_visible="true" - width="100" - height="100" - left_delta="0" - top_delta="21" - > - <text> - placeholder - </text> - <slider - decimal_digits="1" - follows="left|top" - increment="0.01" - initial_value="0" - layout="topleft" - label="X:" - left_delta="10" - max_val="4" - min_val="-4" - name="water_wave2_x" - top_pad="5" - width="100"/> - <slider - decimal_digits="1" - follows="left|top" - increment="0.01" - initial_value="0" - layout="topleft" - label="Y:" - left_delta="0" - max_val="4" - min_val="-4" - name="water_wave2_y" - top_pad="5" - orientation="vertical" - height="70"/> - </panel> + <xy_vector + follows="top|left" + name="water_wave2_xy" + width="120" + height="145" + visible="true" + left_delta="0" + top_delta="21" + min_val_x="-4" + max_val_x="4" + min_val_y="-4" + max_val_y="4" + arrow_color="green"/> <text follows="left|top|right" diff --git a/indra/newview/skins/default/xui/en/widgets/xy_vector.xml b/indra/newview/skins/default/xui/en/widgets/xy_vector.xml new file mode 100644 index 0000000000..93ae26a6ad --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/xy_vector.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<xy_vector + name="xyvector" + width="120" + height="140" + decimal_digits="1" + label_width="16" + padding="4" + edit_bar_height="18" + user_resize="false"> + + <xy_vector.border + visible="true"/> + + <xy_vector.x_entry + name="XEntry" + tab_stop="true" + label="X:"/> + <xy_vector.y_entry + name="YEntry" + tab_stop="true" + label="Y:"/> + + <xy_vector.touch_area + name="TouchArea" + bevel_style="in" + border_visible="true"/> + +</xy_vector> |