diff options
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/colors.xml | 9 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_debug_materials.xml | 995 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 538 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 11 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 483 |
5 files changed, 1505 insertions, 531 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 9bf2922033..48a9430fdc 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -645,6 +645,15 @@ name="PathfindingGoodColor" reference="LtGreen" /> <color + name="MaterialErrorColor" + reference="LtRed" /> + <color + name="MaterialWarningColor" + reference="DrYellow" /> + <color + name="MaterialGoodColor" + reference="LtGreen" /> + <color name="PathfindingDefaultBeaconColor" reference="Red_80" /> <color diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml new file mode 100644 index 0000000000..3a450fdeff --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml @@ -0,0 +1,995 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + positioning="cascading" + can_tear_off="false" + can_resize="true" + height="770" + width="1040" + min_height="795" + min_width="1040" + layout="topleft" + name="floater_debug_materials" + reuse_instance="true" + save_rect="false" + single_instance="true" + title="Debug materials"> + <floater.string name="status_no_region">No current region available.</floater.string> + <floater.string name="status_capabilities_loading">Region capabilities are loading.</floater.string> + <floater.string name="status_ready">Materials are enabled for this region.</floater.string> + <floater.string name="status_request_started">Request sent.</floater.string> + <floater.string name="status_request_completed">Request received.</floater.string> + <floater.string name="status_not_enabled">Materials are not enabled for this region.</floater.string> + <floater.string name="status_error">An error occurred during the request.</floater.string> + <floater.string name="loading_status_in_progress">Processing [NUM_PROCESSED] out of [NUM_TOTAL]</floater.string> + <floater.string name="loading_status_done">Complete</floater.string> + <floater.string name="querying_status_in_progress">Processing [NUM_PROCESSED] out of [NUM_TOTAL]</floater.string> + <floater.string name="querying_status_done">Complete</floater.string> + <panel + border="false" + bevel_style="none" + follows="left|top" + layout="topleft" + left="12" + top_pad="10" + height="61" + width="214"> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + layout="topleft" + left="0" + top_pad="0" + width="214"> + Status + </text> + <text + height="40" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="MaterialGoodColor" + length="1" + follows="left|top" + layout="topleft" + left="0" + name="material_status" + top_pad="8" + width="214"> + </text> + </panel> + <tab_container + follows="left|top|right" + layout="topleft" + tab_position="top" + left="10" + top_pad="10" + height="670" + width="1020"> + <panel + border="true" + bevel_style="none" + follows="left|top|right" + layout="topleft" + label="Current region" + height="641" + top_pad="10" + width="1020"> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + height="479" + top_pad="10" + width="1020"> + <button + follows="left|top" + height="22" + label="Get" + layout="topleft" + name="get_button" + top_pad="0" + width="214"/> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="2" + top_pad="8" + width="150"> + Loading Status + </text> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="MaterialGoodColor" + length="1" + follows="left|top" + layout="topleft" + left_pad="0" + name="loading_status" + top_pad="-13" + width="400"> + </text> + <scroll_list + column_padding="0" + draw_heading="true" + follows="left|top|right" + height="135" + layout="topleft" + left="0" + top_pad="10" + tab_stop="false" + multi_select="false" + name="get_other_data_scroll_list" + width="775"> + <scroll_list.columns + label="Material ID" + name="id" + dynamic_width="true" /> + <scroll_list.columns + label="Specular Color" + name="specular_color" + width="120" /> + <scroll_list.columns + label="Specular Exponent" + name="specular_exponent" + width="112" /> + <scroll_list.columns + label="Env Intensity" + name="env_intensity" + width="80" /> + <scroll_list.columns + label="Alpha Mask Cutoff" + name="alpha_mask_cutoff" + width="110" /> + <scroll_list.columns + label="Diffuse Alpha Mode" + name="diffuse_alpha_mode" + width="118" /> + </scroll_list> + <scroll_list + column_padding="0" + draw_heading="true" + follows="left|top|right" + height="135" + layout="topleft" + top_pad="10" + tab_stop="false" + multi_select="false" + name="get_specular_map_scroll_list" + width="1020"> + <scroll_list.columns + label="Material ID" + name="id" + dynamic_width="true" /> + <scroll_list.columns + label="Specular Map" + name="specular_map_list_map" + width="225" /> + <scroll_list.columns + label="Offset X" + name="specular_map_list_offset_x" + width="112" /> + <scroll_list.columns + label="Offset Y" + name="specular_map_list_offset_y" + width="112" /> + <scroll_list.columns + label="Repeat X" + name="specular_map_list_repeat_x" + width="112" /> + <scroll_list.columns + label="Repeat Y" + name="specular_map_list_repeat_y" + width="112" /> + <scroll_list.columns + label="Rotation" + name="specular_map_list_rotation" + width="112" /> + </scroll_list> + <scroll_list + column_padding="0" + draw_heading="true" + follows="left|top|right" + height="135" + layout="topleft" + top_pad="10" + tab_stop="false" + multi_select="false" + name="get_normal_map_scroll_list" + width="1020"> + <scroll_list.columns + label="Material ID" + name="id" + dynamic_width="true" /> + <scroll_list.columns + label="Normal Map" + name="normal_map_list_map" + width="225" /> + <scroll_list.columns + label="Offset X" + name="normal_map_list_offset_x" + width="112" /> + <scroll_list.columns + label="Offset Y" + name="normal_map_list_offset_y" + width="112" /> + <scroll_list.columns + label="Repeat X" + name="normal_map_list_repeat_x" + width="112" /> + <scroll_list.columns + label="Repeat Y" + name="normal_map_list_repeat_y" + width="112" /> + <scroll_list.columns + label="Rotation" + name="normal_map_list_rotation" + width="112" /> + </scroll_list> + </panel> + </panel> + <panel + border="true" + bevel_style="none" + follows="left|top|right" + layout="topleft" + label="Object editing" + height="641" + top_pad="10" + width="1010"> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + left="2" + top_pad="10" + height="420" + width="810"> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + height="265" + top_pad="0" + width="810"> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + height="226" + top_pad="0" + width="263"> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="0" + top_pad="38" + width="160"> + Normal Map + </text> + <texture_picker + allow_no_texture="true" + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + left_pad="0" + top_pad="-50" + label_width="0" + height="100" + width="100" + mouse_opaque="true" + name="normal_map" + tool_tip="Click to open texture picker" /> + <spinner + allow_text_entry="true" + follows="left|top" + height="20" + initial_value="0" + increment="0.1" + decimal_digits="4" + label_width="160" + layout="topleft" + left_pad="-260" + label="Normal Map Offset X" + max_val="1.0" + min_val="-1.0" + name="normal_map_offset_x" + width="240" /> + <spinner + allow_text_entry="true" + follows="left|top" + height="20" + initial_value="0" + increment="0.1" + decimal_digits="4" + label_width="160" + layout="topleft" + left_pad="-240" + label="Normal Map Offset Y" + max_val="1.0" + min_val="-1.0" + name="normal_map_offset_y" + top_pad="10" + width="240" /> + <spinner + allow_text_entry="true" + follows="left|top" + height="20" + initial_value="0" + increment="0.1" + decimal_digits="4" + label_width="160" + layout="topleft" + left_pad="-240" + label="Normal Map Repeat X" + max_val="64" + min_val="0.0" + name="normal_map_repeat_x" + top_pad="10" + width="240" /> + <spinner + allow_text_entry="true" + follows="left|top" + height="20" + initial_value="0" + increment="0.1" + decimal_digits="4" + label_width="160" + layout="topleft" + left_pad="-240" + max_val="64" + min_val="0.0" + label="Normal Map Repeat Y" + name="normal_map_repeat_y" + top_pad="10" + width="240" /> + <spinner + allow_text_entry="true" + follows="left|top" + height="20" + initial_value="0" + increment="1" + decimal_digits="4" + label_width="160" + layout="topleft" + left_pad="-240" + label="Normal Map Rotation" + max_val="9999" + min_val="-9999" + name="normal_map_rotation" + top_pad="10" + width="240" /> + </panel> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + height="226" + top_pad="-226" + left_pad="20" + width="263"> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="0" + top_pad="38" + width="160"> + Specular Map + </text> + <texture_picker + allow_no_texture="true" + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + left_pad="0" + top_pad="-50" + label_width="0" + height="100" + width="100" + mouse_opaque="true" + name="specular_map" + tool_tip="Click to open texture picker" /> + <spinner + allow_text_entry="true" + follows="left|top" + height="20" + initial_value="0" + increment="0.1" + decimal_digits="4" + label_width="160" + layout="topleft" + left_pad="-260" + label="Specular Map Offset X" + max_val="1.0" + min_val="-1.0" + name="specular_map_offset_x" + width="240" /> + <spinner + allow_text_entry="true" + follows="left|top" + height="20" + initial_value="0" + increment="0.1" + decimal_digits="4" + label_width="160" + layout="topleft" + left_pad="-240" + label="Specular Map Offset Y" + max_val="1.0" + min_val="-1.0" + name="specular_map_offset_y" + top_pad="10" + width="240" /> + <spinner + allow_text_entry="true" + follows="left|top" + height="20" + initial_value="0" + increment="0.1" + decimal_digits="4" + label_width="160" + layout="topleft" + left_pad="-240" + label="Specular Map Repeat X" + max_val="64" + min_val="0.0" + name="specular_map_repeat_x" + top_pad="10" + width="240" /> + <spinner + allow_text_entry="true" + follows="left|top" + height="20" + initial_value="0" + increment="0.1" + decimal_digits="4" + label_width="160" + layout="topleft" + left_pad="-240" + label="Specular Map Repeat Y" + max_val="64" + min_val="0.0" + name="specular_map_repeat_y" + top_pad="10" + width="240" /> + <spinner + allow_text_entry="true" + follows="left|top" + height="20" + initial_value="0" + increment="1" + decimal_digits="4" + label_width="160" + layout="topleft" + left_pad="-240" + label="Specular Map Rotation" + max_val="9999" + min_val="-9999" + name="specular_map_rotation" + top_pad="10" + width="240" /> + </panel> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + height="162" + top_pad="-226" + left_pad="20" + width="243"> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="0" + top_pad="10" + width="160"> + Specular Color + </text> + <color_swatch + can_apply_immediately="true" + color="1 1 1 1" + follows="left|top" + height="30" + layout="topleft" + label_height="0" + label_width="0" + left_pad="0" + top_pad="-22" + name="specular_color" + tool_tip="Click to open color picker" + width="40" /> + <spinner + follows="left|top" + height="20" + initial_value="255" + max_val="255" + min_val="0" + increment="1" + decimal_digits="0" + allow_text_entry="true" + layout="topleft" + label_width="160" + left="0" + top_pad="10" + label="Specular Color Alpha" + name="specular_color_alpha" + width="240" /> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left_pad="-240" + top_pad="13" + width="160"> + Specular Exponent + </text> + <line_editor + border_style="line" + border_thickness="1" + default_text="0" + follows="left|top" + height="20" + layout="topleft" + left_pad="0" + top_pad="-18" + max_length_chars="255" + name="specular_exponent" + width="80" /> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left_pad="-240" + top_pad="10" + width="160"> + Environment Exponent + </text> + <line_editor + border_style="line" + border_thickness="1" + default_text="0" + follows="left|top" + height="20" + layout="topleft" + left_pad="0" + top_pad="-18" + max_length_chars="255" + name="environment_exponent" + width="80" /> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left_pad="-240" + top_pad="10" + width="160"> + Alpha Mask Cuttoff + </text> + <line_editor + border_style="line" + border_thickness="1" + default_text="0" + follows="left|top" + height="20" + layout="topleft" + left_pad="0" + top_pad="-18" + max_length_chars="255" + name="alpha_mask_cutoff" + width="80" /> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left_pad="-240" + top_pad="10" + width="160"> + Diffuse Alpha Mode + </text> + <line_editor + border_style="line" + border_thickness="1" + default_text="0" + follows="left|top" + height="20" + layout="topleft" + left_pad="0" + top_pad="-18" + max_length_chars="255" + name="diffuse_alpha_mode" + width="80" /> + </panel> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + height="22" + left="0" + top_pad="80" + width="810"> + <button + follows="left|top" + height="22" + label="Set Face Data" + layout="topleft" + name="put_set_button" + left="0" + top="0" + width="214"/> + <button + follows="left|top" + height="22" + label="Clear Face Data" + layout="topleft" + name="put_clear_button" + left_pad="20" + width="214"/> + <button + follows="left|top" + height="22" + label="Reset Input Values" + layout="topleft" + name="reset_put_values_button" + left_pad="146" + width="214"/> + </panel> + </panel> + <view_border + bevel_style="none" + follows="left|top" + height="0" + layout="topleft" + name="horiz_separator" + top_pad="10" + left="0" + width="810"/> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + height="125" + top_pad="20" + width="400"> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="0" + top_pad="0" + width="160"> + Active selection + </text> + <scroll_list + column_padding="0" + draw_heading="true" + follows="left|top|right" + height="300" + layout="topleft" + left="0" + top_pad="10" + tab_stop="false" + multi_select="true" + name="put_scroll_list" + width="600"> + <scroll_list.columns + label="Object ID" + name="object_id" + width="225" /> + <scroll_list.columns + label="Face Index" + name="face_index" + width="70" /> + <scroll_list.columns + label="MaterialID" + name="material_id" + dynamic_width="true" /> + </scroll_list> + </panel> + </panel> + </panel> + <panel + border="true" + bevel_style="none" + follows="left|top|right" + layout="topleft" + label="Viewable objects" + height="641" + top_pad="10" + width="1020"> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + height="641" + top_pad="0" + width="1020"> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + left="0" + top_pad="10" + height="153" + width="835"> + <button + follows="left|top" + height="22" + label="Query Viewable Objects" + layout="topleft" + name="query_viewable_objects_button" + top_pad="0" + width="214"/> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left="2" + top_pad="8" + width="150"> + Loading Status + </text> + <text + height="13" + word_wrap="true" + use_ellipses="false" + type="string" + text_color="MaterialGoodColor" + length="1" + follows="left|top" + layout="topleft" + left_pad="0" + name="query_status" + top_pad="-13" + width="400"> + </text> + <scroll_list + column_padding="0" + draw_heading="true" + follows="left|top|right" + height="100" + layout="topleft" + top_pad="10" + left="0" + tab_stop="false" + multi_select="true" + name="viewable_objects_scroll_list" + width="835"> + <scroll_list.columns + label="Object ID" + name="object_id" + width="225" /> + <scroll_list.columns + label="Region" + name="region" + width="225" /> + <scroll_list.columns + label="Local ID" + name="local_id" + width="70" /> + <scroll_list.columns + label="Face" + name="face_index" + width="70" /> + <scroll_list.columns + label="Material ID" + name="material_id" + dynamic_width="true" /> + </scroll_list> + </panel> + <view_border + bevel_style="none" + follows="left|right|top" + height="0" + layout="topleft" + name="horiz_separator" + top_pad="10" + left="0" + width="1020"/> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + height="457" + top_pad="10" + width="1020"> + <button + follows="left|top" + height="22" + label="Post Material ID" + layout="topleft" + name="post_button" + top_pad="0" + width="214"/> + <scroll_list + column_padding="0" + draw_heading="true" + follows="left|top|right" + height="135" + layout="topleft" + top_pad="10" + left="0" + tab_stop="false" + multi_select="false" + name="post_other_data_scroll_list" + width="775"> + <scroll_list.columns + label="Material ID" + name="id" + dynamic_width="true" /> + <scroll_list.columns + label="Specular Color" + name="specular_color" + width="120" /> + <scroll_list.columns + label="Specular Exponent" + name="specular_exponent" + width="112" /> + <scroll_list.columns + label="Env Intensity" + name="env_intensity" + width="80" /> + <scroll_list.columns + label="Alpha Mask Cutoff" + name="alpha_mask_cutoff" + width="110" /> + <scroll_list.columns + label="Diffuse Alpha Mode" + name="diffuse_alpha_mode" + width="118" /> + </scroll_list> + <scroll_list + column_padding="0" + draw_heading="true" + follows="left|top|right" + height="135" + layout="topleft" + top_pad="10" + tab_stop="false" + multi_select="false" + name="post_specular_map_scroll_list" + width="1020"> + <scroll_list.columns + label="Material ID" + name="id" + dynamic_width="true" /> + <scroll_list.columns + label="Specular Map" + name="specular_map_list_map" + width="225" /> + <scroll_list.columns + label="Offset X" + name="specular_map_list_offset_x" + width="112" /> + <scroll_list.columns + label="Offset Y" + name="specular_map_list_offset_y" + width="112" /> + <scroll_list.columns + label="Repeat X" + name="specular_map_list_repeat_x" + width="112" /> + <scroll_list.columns + label="Repeat Y" + name="specular_map_list_repeat_y" + width="112" /> + <scroll_list.columns + label="Rotation" + name="specular_map_list_rotation" + width="112" /> + </scroll_list> + <scroll_list + column_padding="0" + draw_heading="true" + follows="left|top|right" + height="135" + layout="topleft" + top_pad="10" + tab_stop="false" + multi_select="false" + name="post_normal_map_scroll_list" + width="1020"> + <scroll_list.columns + label="Material ID" + name="id" + dynamic_width="true" /> + <scroll_list.columns + label="Normal Map" + name="normal_map_list_map" + width="225" /> + <scroll_list.columns + label="Offset X" + name="normal_map_list_offset_x" + width="112" /> + <scroll_list.columns + label="Offset Y" + name="normal_map_list_offset_y" + width="112" /> + <scroll_list.columns + label="Repeat X" + name="normal_map_list_repeat_x" + width="112" /> + <scroll_list.columns + label="Repeat Y" + name="normal_map_list_repeat_y" + width="112" /> + <scroll_list.columns + label="Rotation" + name="normal_map_list_rotation" + width="112" /> + </scroll_list> + </panel> + </panel> + </panel> + </tab_container> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 5204efbf65..3b501e1ece 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2,7 +2,7 @@ <floater positioning="cascading" legacy_header_height="18" - height="590" + height="615" layout="topleft" bg_opaque_image="Window_NoTitle_Foreground" bg_alpha_image="Window_NoTitle_Background" @@ -830,7 +830,7 @@ width="282"/> <tab_container follows="left|top" - height="410" + height="435" halign="center" left="0" name="Object Info Tabs" @@ -1353,7 +1353,7 @@ even though the user gets a free copy. <panel border="false" follows="all" - height="567" + height="592" label="Object" layout="topleft" left_delta="0" @@ -2110,7 +2110,7 @@ even though the user gets a free copy. <panel border="false" follows="all" - height="367" + height="392" label="Features" layout="topleft" left_delta="0" @@ -2491,534 +2491,10 @@ even though the user gets a free copy. width="132" /> </panel> <panel - border="false" - follows="all" - height="367" label="Texture" - layout="topleft" - left_delta="0" - mouse_opaque="false" help_topic="toolbox_texture_tab" name="Texture" - top_delta="0" - width="295"> - <panel.string - name="string repeats per meter"> - Repeats Per Meter - </panel.string> - <panel.string - name="string repeats per face"> - Repeats Per Face - </panel.string> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - fallback_image="locked_image.j2c" - follows="left|top" - height="80" - label="Texture" - layout="topleft" - left="10" - name="texture control" - tool_tip="Click to choose a picture" - top="8" - width="64" /> - <color_swatch - can_apply_immediately="true" - follows="left|top" - height="80" - label="Color" - layout="topleft" - left_pad="15" - name="colorswatch" - tool_tip="Click to open color picker" - top_delta="0" - width="64" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_pad="15" - name="color trans" - text_readonly_color="LabelDisabledColor" - top="6" - width="110"> - Transparency % - </text> - <spinner - decimal_digits="0" - follows="left|top" - height="19" - increment="2" - initial_value="0" - layout="topleft" - left_delta="0" - max_val="100" - name="ColorTrans" - top_pad="4" - width="80" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_delta="0" - name="glow label" - text_readonly_color="LabelDisabledColor" - top_pad="8" - width="80"> - Glow - </text> - <spinner - decimal_digits="2" - follows="left|top" - height="19" - initial_value="0" - layout="topleft" - left_delta="0" - name="glow" - top_pad="4" - width="80" /> - <check_box - height="19" - label="Full Bright" - layout="topleft" - left_delta="-5" - name="checkbox fullbright" - top_pad="4" - width="81" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="tex gen" - text_readonly_color="LabelDisabledColor" - top_pad="5" - width="90"> - Mapping - </text> - <combo_box - height="23" - layout="topleft" - left_delta="0" - name="combobox texgen" - top_pad="4" - width="90"> - <combo_box.item - label="Default" - name="Default" - value="Default" /> - <combo_box.item - label="Planar" - name="Planar" - value="Planar" /> - </combo_box> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - name="label shininess" - left_pad="4" - text_readonly_color="LabelDisabledColor" - top_pad="-37" - width="90"> - Shininess - </text> - <combo_box - height="23" - layout="topleft" - left_delta="0" - name="combobox shininess" - top_pad="4" - width="90"> - <combo_box.item - label="None" - name="None" - value="None" /> - <combo_box.item - label="Low" - name="Low" - value="Low" /> - <combo_box.item - label="Medium" - name="Medium" - value="Medium" /> - <combo_box.item - label="High" - name="High" - value="High" /> - </combo_box> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_pad="4" - name="label bumpiness" - text_readonly_color="LabelDisabledColor" - top_pad="-37" - width="90"> - Bumpiness - </text> - <combo_box - height="23" - layout="topleft" - left_delta="0" - name="combobox bumpiness" - top_pad="4" - width="90"> - <combo_box.item - label="None" - name="None" - value="None" /> - <combo_box.item - label="Brightness" - name="Brightness" - value="Brightness" /> - <combo_box.item - label="Darkness" - name="Darkness" - value="Darkness" /> - <combo_box.item - label="woodgrain" - name="woodgrain" - value="woodgrain" /> - <combo_box.item - label="bark" - name="bark" - value="bark" /> - <combo_box.item - label="bricks" - name="bricks" - value="bricks" /> - <combo_box.item - label="checker" - name="checker" - value="checker" /> - <combo_box.item - label="concrete" - name="concrete" - value="concrete" /> - <combo_box.item - label="crustytile" - name="crustytile" - value="crustytile" /> - <combo_box.item - label="cutstone" - name="cutstone" - value="cutstone" /> - <combo_box.item - label="discs" - name="discs" - value="discs" /> - <combo_box.item - label="gravel" - name="gravel" - value="gravel" /> - <combo_box.item - label="petridish" - name="petridish" - value="petridish" /> - <combo_box.item - label="siding" - name="siding" - value="siding" /> - <combo_box.item - label="stonetile" - name="stonetile" - value="stonetile" /> - <combo_box.item - label="stucco" - name="stucco" - value="stucco" /> - <combo_box.item - label="suction" - name="suction" - value="suction" /> - <combo_box.item - label="weave" - name="weave" - value="weave" /> - </combo_box> - <!-- - <line_editor - bevel_style="in" - border_style="line" - border_thickness="1" - follows="left|top" - height="16" - layout="topleft" - left="10" - max_length_bytes="63" - name="Home Url" - select_on_focus="true" - top="134" - width="250" /> - <check_box - height="16" - label="Media Face" - layout="topleft" - left_delta="0" - name="has media" - top_pad="6" - width="70" /> - <button - follows="left|top" - font="SansSerifSmall" - height="20" - label="Set Media Info" - label_selected="Set Media Info" - layout="topleft" - left_pad="60" - name="media info set" - top_delta="-4" - width="120" /> ---> - <check_box - follows="top|left" - height="16" - initial_value="false" - label="Align planar faces" - layout="topleft" - left="17" - name="checkbox planar align" - tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping." - top_delta="26" - width="140" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="rpt" - text_readonly_color="LabelDisabledColor" - top_pad="2" - width="140"> - Repeats / Face - </text> - <spinner - follows="left|top" - height="19" - initial_value="0" - label="Horizontal (U)" - label_width="125" - layout="topleft" - left="20" - max_val="100" - name="TexScaleU" - top_pad="5" - width="185" /> - <check_box - height="19" - label="Flip" - layout="topleft" - left_pad="5" - name="checkbox flip s" - top_delta="0" - width="70" /> - <spinner - follows="left|top" - height="19" - initial_value="0" - label="Vertical (V)" - label_width="125" - layout="topleft" - left="20" - max_val="100" - name="TexScaleV" - width="185" /> - <check_box - height="19" - label="Flip" - layout="topleft" - left_pad="5" - name="checkbox flip t" - top_delta="0" - width="70" /> - <spinner - decimal_digits="2" - follows="left|top" - height="19" - increment="1" - initial_value="0" - label="RotationĖ" - layout="topleft" - label_width="135" - left="10" - max_val="9999" - min_val="-9999" - name="TexRot" - width="195" /> - - <spinner - decimal_digits="1" - follows="left|top" - height="23" - initial_value="1" - label="Repeats / Meter" - layout="topleft" - label_width="135" - left="10" - max_val="10" - min_val="0.1" - name="rptctrl" - width="195" /> - <button - follows="left|top" - height="23" - label="Apply" - label_selected="Apply" - layout="topleft" - left_pad="5" - name="button apply" - width="75" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="tex offset" - text_readonly_color="LabelDisabledColor" - width="200"> - Texture Offset - </text> - <spinner - follows="left|top" - height="19" - initial_value="0" - label="Horizontal (U)" - label_width="125" - layout="topleft" - left="20" - min_val="-1" - name="TexOffsetU" - width="185" /> - <spinner - follows="left|top" - height="19" - initial_value="0" - label="Vertical (V)" - label_width="125" - layout="topleft" - left_delta="0" - min_val="-1" - name="TexOffsetV" - top_pad="1" - width="185" /> - <panel - border="false" - follows="left|top" - layout="topleft" - mouse_opaque="false" - background_visible="true" - bg_alpha_color="DkGray" - name="Add_Media" - left="0" - height="47" - width="290"> - <text - type="string" - length="1" - follows="left|top" - height="18" - layout="topleft" - left="10" - top_pad="3" - name="media_tex" - width="190"> - Media - </text> - <button - follows="top|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" - layout="topleft" - left_pad="0" - name="add_media" - tab_stop="false" - top_delta="0" - tool_tip="Add Media" - width="18"> - <button.commit_callback - function="BuildTool.AddMedia"/> - </button> - <button - follows="top|left" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - layout="topleft" - left_pad="5" - name="delete_media" - tool_tip="Delete this media texture" - top_delta="0" - width="18"> - <button.commit_callback - function="BuildTool.DeleteMedia"/> - </button> - <button - follows="top|left" - tool_tip="Edit this Media" - height="12" - image_disabled="Icon_Gear_Background" - image_selected="Icon_Gear_Press" - image_unselected="Icon_Gear_Foreground" - layout="topleft" - left_pad="10" - name="edit_media" - top_delta="3" - width="12"> - <button.commit_callback - function="BuildTool.EditMedia"/> - </button> - <text - follows="left|top|right" - height="9" - layout="topleft" - left="10" - use_ellipses="true" - read_only="true" - name="media_info" - width="280" /> - <web_browser - visible="false" - enabled="false" - border_visible="true" - bottom_delta="0" - follows="top|left" - left="0" - name="title_media" - width="4" - height="4" - start_url="about:blank" - decouple_texture_size="true" /> - <button - follows="right|top" - height="22" - label="Align" - label_selected="Align Media" - layout="topleft" - right="-16" - name="button align" - top_delta="-4" - tool_tip="Align media texture (must load first)" - width="80" /> - </panel> + filename="panel_tools_texture.xml"> </panel> <panel border="false" @@ -3054,7 +2530,7 @@ even though the user gets a free copy. border_visible="true" bevel_style="in" follows="left|top|right" - height="325" + height="350" layout="topleft" left="10" name="contents_inventory" @@ -3064,7 +2540,7 @@ even though the user gets a free copy. </tab_container> <panel follows="left|top" - height="384" + height="409" layout="topleft" left_delta="0" name="land info panel" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 18932a32d0..721a1818dd 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2619,6 +2619,17 @@ <menu_item_check.on_enable function="Advanced.EnableRenderDeferredOptions" /> </menu_item_check> + + <menu_item_separator/> + + <menu_item_call + label="Debug materials ..." + name="DebugMaterialsMenu"> + <menu_item_call.on_click + function="Floater.ToggleOrBringToFront" + parameter="floater_debug_materials" /> + </menu_item_call> + <menu_item_separator /> <menu_item_check diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml new file mode 100644 index 0000000000..26b2d83351 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -0,0 +1,483 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="false" + follows="all" + height="400" + label="Texture" + layout="topleft" + left="0" + mouse_opaque="false" + help_topic="toolbox_texture_tab" + name="Texture" + top="0" + width="295"> + <panel.string + name="string repeats per meter"> + Repeats Per Meter + </panel.string> + <panel.string + name="string repeats per face"> + Repeats Per Face + </panel.string> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="color label" + text_readonly_color="LabelDisabledColor" + top="6" + width="64"> + Color + </text> + <!-- label is blank because control places it below the box --> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="45" + label="" + layout="topleft" + left="10" + name="colorswatch" + tool_tip="Click to open color picker" + top="20" + width="64" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="15" + name="color trans" + text_readonly_color="LabelDisabledColor" + top="6" + width="110"> + Transparency % + </text> + <spinner + decimal_digits="0" + follows="left|top" + height="19" + increment="2" + initial_value="0" + layout="topleft" + left_delta="0" + max_val="100" + name="ColorTrans" + top_pad="4" + width="80" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="15" + name="glow label" + text_readonly_color="LabelDisabledColor" + top="6" + width="80"> + Glow + </text> + <spinner + decimal_digits="2" + follows="left|top" + height="19" + initial_value="0" + layout="topleft" + left_delta="0" + name="glow" + top_pad="4" + width="80" /> + <check_box + height="19" + label="Full Bright" + layout="topleft" + left="7" + name="checkbox fullbright" + top_pad="4" + width="81" /> + <combo_box + height="23" + layout="topleft" + left="10" + name="combobox matmedia" + top_pad="5" + width="100"> + <combo_box.item + label="Materials" + name="Materials" + value="Materials" /> + <combo_box.item + label="Media" + name="Media" + value="Media" /> + </combo_box> + <combo_box + height="23" + layout="topleft" + left_pad="10" + name="combobox mattype" + top_delta="0" + width="155"> + <combo_box.item + label="Texture (diffuse)" + name="Texture (diffuse)" + value="Texture (diffuse)" /> + <combo_box.item + label="Bumpiness (normal)" + name="Bumpiness (normal)" + value="Bumpiness (normal)" /> + <combo_box.item + label="Shininess (specular)" + name="Shininess (specular)" + value="Shininess (specular)" /> + </combo_box> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + fallback_image="locked_image.j2c" + follows="left|top" + height="80" + label="Texture " + layout="topleft" + left="10" + name="texture control" + tool_tip="Click to choose a picture" + top_pad="8" + width="64" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + name="label shininess" + left_pad="10" + text_readonly_color="LabelDisabledColor" + top_delta="6" + width="90"> + Shininess + </text> + <combo_box + height="23" + layout="topleft" + left_pad="10" + name="combobox shininess" + top_delta="-6" + width="90"> + <combo_box.item + label="None" + name="None" + value="None" /> + <combo_box.item + label="Low" + name="Low" + value="Low" /> + <combo_box.item + label="Medium" + name="Medium" + value="Medium" /> + <combo_box.item + label="High" + name="High" + value="High" /> + </combo_box> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="-100" + name="label bumpiness" + text_readonly_color="LabelDisabledColor" + top_delta="0" + width="90"> + Bumpiness + </text> + <combo_box + height="23" + layout="topleft" + left_delta="0" + name="combobox bumpiness" + top_pad="4" + width="90"> + <combo_box.item + label="None" + name="None" + value="None" /> + <combo_box.item + label="Brightness" + name="Brightness" + value="Brightness" /> + <combo_box.item + label="Darkness" + name="Darkness" + value="Darkness" /> + <combo_box.item + label="woodgrain" + name="woodgrain" + value="woodgrain" /> + <combo_box.item + label="bark" + name="bark" + value="bark" /> + <combo_box.item + label="bricks" + name="bricks" + value="bricks" /> + <combo_box.item + label="checker" + name="checker" + value="checker" /> + <combo_box.item + label="concrete" + name="concrete" + value="concrete" /> + <combo_box.item + label="crustytile" + name="crustytile" + value="crustytile" /> + <combo_box.item + label="cutstone" + name="cutstone" + value="cutstone" /> + <combo_box.item + label="discs" + name="discs" + value="discs" /> + <combo_box.item + label="gravel" + name="gravel" + value="gravel" /> + <combo_box.item + label="petridish" + name="petridish" + value="petridish" /> + <combo_box.item + label="siding" + name="siding" + value="siding" /> + <combo_box.item + label="stonetile" + name="stonetile" + value="stonetile" /> + <combo_box.item + label="stucco" + name="stucco" + value="stucco" /> + <combo_box.item + label="suction" + name="suction" + value="suction" /> + <combo_box.item + label="weave" + name="weave" + value="weave" /> + </combo_box> + <text + follows="left|top|right" + height="9" + layout="topleft" + left="10" + top_delta="-8" + use_ellipses="true" + read_only="true" + name="media_info" + width="280"> + URL of chosen media, if any, goes here + </text> + <button + follows="top|left" + height="18" + layout="topleft" + left="10" + name="add_media" + top_pad="4" + tool_tip="Add Media" + label="Choose..." + width="85"> + <button.commit_callback + function="BuildTool.AddMedia"/> + </button> + <button + follows="top|left" + height="18" + layout="topleft" + left_pad="5" + name="delete_media" + tool_tip="Delete this media texture" + top_delta="0" + label="Remove" + width="85"> + <button.commit_callback + function="BuildTool.DeleteMedia"/> + </button> + <button + follows="left|top" + height="18" + label="Align" + label_selected="Align Media" + layout="topleft" + left_pad="5" + name="button align" + top_delta="0" + tool_tip="Align media texture (must load first)" + width="85" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="tex gen" + text_readonly_color="LabelDisabledColor" + top_pad="60" + width="140"> + Mapping + </text> + <combo_box + height="23" + layout="topleft" + left_pad="0" + name="combobox texgen" + top_pad="-13" + width="125"> + <combo_box.item + label="Default" + name="Default" + value="Default" /> + <combo_box.item + label="Planar" + name="Planar" + value="Planar" /> + </combo_box> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Horizontal scale" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="TexScaleU" + top_pad="5" + width="265" /> + <!-- <check_box + height="19" + label="Flip" + layout="topleft" + left_pad="5" + name="checkbox flip s" + top_delta="0" + width="70" /> --> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Vertical scale" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="TexScaleV" + width="265" /> + <!-- <check_box + height="19" + label="Flip" + layout="topleft" + left_pad="5" + name="checkbox flip t" + top_delta="0" + width="70" /> --> + <spinner + decimal_digits="1" + follows="left|top" + height="19" + initial_value="" + label="Repeats per meter" + layout="topleft" + label_width="205" + left="10" + max_val="10" + min_val="0.1" + name="rptctrl" + width="265" /> + <!-- <button + follows="left|top" + height="19" + label="Apply" + label_selected="Apply" + layout="topleft" + left_pad="5" + name="button apply" + width="75" /> --> + <spinner + decimal_digits="2" + follows="left|top" + height="19" + increment="1" + initial_value="0" + label="Rotation degrees" + layout="topleft" + label_width="205" + left="10" + max_val="9999" + min_val="-9999" + name="TexRot" + width="265" /> + + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Horizontal offset" + label_width="205" + layout="topleft" + left="10" + min_val="-1" + name="TexOffsetU" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Vertical offset" + label_width="205" + layout="topleft" + left="10" + min_val="-1" + name="TexOffsetV" + width="265" /> + <check_box + follows="top|left" + height="16" + initial_value="false" + label="Align planar faces" + layout="topleft" + left="7" + name="checkbox planar align" + tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping." + top_delta="26" + width="260" /> + <web_browser + visible="false" + enabled="false" + border_visible="true" + bottom_delta="0" + follows="top|left" + left="0" + name="title_media" + width="4" + height="4" + start_url="about:blank" + decouple_texture_size="true" /> + </panel> |