diff options
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/colors.xml | 9 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_debug_materials.xml | 1075 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 11 |
3 files changed, 1095 insertions, 0 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..cdc1e63ce1 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml @@ -0,0 +1,1075 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + positioning="cascading" + can_tear_off="false" + can_resize="true" + height="725" + width="1040" + min_height="750" + 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> + <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="620" + width="1020"> + <panel + border="true" + bevel_style="none" + follows="left|top|right" + layout="topleft" + label="Current region" + height="620" + 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="620" + 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" /> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left_pad="-260" + top_pad="10" + width="160"> + Normal Map Offset X + </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="normal_map_offset_x" + 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"> + Normal Map Offset Y + </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="normal_map_offset_y" + 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"> + Normal Map Repeat X + </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="normal_map_repeat_x" + 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"> + Normal Map Repeat Y + </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="normal_map_repeat_y" + 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"> + Normal Map Rotation + </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="normal_map_rotation" + width="80" /> + </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" /> + <text + height="13" + word_wrap="false" + use_ellipses="false" + type="string" + text_color="LabelTextColor" + length="1" + follows="left|top" + layout="topleft" + left_pad="-260" + top_pad="10" + width="160"> + Specular Map Offset X + </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_map_offset_x" + 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"> + Specular Map Offset Y + </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_map_offset_y" + 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"> + Specular Map Repeat X + </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_map_repeat_x" + 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"> + Specular Map Repeat Y + </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_map_repeat_y" + 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"> + Specular Map Rotation + </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_map_rotation" + width="80" /> + </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"> + Results + </text> + <scroll_list + column_padding="0" + draw_heading="true" + follows="left|top|right" + height="100" + layout="topleft" + left="0" + top_pad="10" + tab_stop="false" + multi_select="true" + name="put_scroll_list" + width="400"> + <scroll_list.columns + label="Object ID" + name="object_id" + width="80" /> + <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="620" + top_pad="10" + width="1020"> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + height="620" + top_pad="0" + width="1020"> + <panel + border="false" + bevel_style="none" + follows="left|top|right" + layout="topleft" + left="0" + top_pad="10" + height="132" + width="835"> + <button + follows="left|top" + height="22" + label="Query Viewable Objects" + layout="topleft" + name="query_viewable_objects_button" + top_pad="0" + width="214"/> + <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="458" + top_pad="10" + width="1020"> + <button + follows="left|top" + height="22" + label="Post Good Material ID" + layout="topleft" + name="good_post_button" + top_pad="0" + width="214"/> + <button + follows="left|top" + height="22" + label="Post Bad Material ID" + layout="topleft" + name="bad_post_button" + left_pad="20" + 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/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 1aa55acf2d..2ac7c0dd46 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2611,6 +2611,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 |