Adding the new material settings to the edit values. And an initial re-organization of the groups into tabs. Still a WIP, but somewhat usable.

1 files changed, 737 insertions, 188 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index 0c4d311c0f..122b5e54e1 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -3,7 +3,7 @@
     positioning="cascading"
     can_tear_off="false"
     can_resize="true"
-    height="575"
+    height="680"
     width="1244"
     min_height="600"
     min_width="1100"
@@ -66,205 +66,754 @@
       top_pad="0"
       left="12"
       width="1220"/>
-  <panel
-      border="false"
-      bevel_style="none"
+  <tab_container
       follows="left|top|right"
       layout="topleft"
-      height="167"
+      tab_position="top"
+      name="view_test_tab_container"
+      left="10"
       top_pad="10"
+      height="500"
       width="1220">
-    <button
-        follows="left|top"
-        height="22"
-        label="Get"
-        layout="topleft"
-        name="get_button"
-        top_pad="0"
-        width="214"/>
-    <scroll_list
-        column_padding="0"
-        draw_heading="true"
+    <panel
+        border="true"
+        bevel_style="none"
         follows="left|top|right"
-        height="135"
         layout="topleft"
+        label="Region"
+        height="167"
         top_pad="10"
-        tab_stop="false"
-        multi_select="true"
-        name="get_scroll_list"
         width="1220">
-      <scroll_list.columns
-          label="Material ID"
-          name="id"
-          dynamic_width="true" />
-      <scroll_list.columns
-          label="Normal Map"
-          name="normal_map"
-          width="225" />
-      <scroll_list.columns
-          label="Specular Map"
-          name="specular_map"
-          width="225" />
-      <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>
-  </panel>
-  <view_border
-      bevel_style="none"
-      follows="left|right|top"
-      height="0"
-      layout="topleft"
-      name="horiz_separator"
-      top_pad="10"
-      left="12"
-      width="1220"/>
-  <panel
-      border="false"
-      bevel_style="none"
-      follows="left|top|right"
-      layout="topleft"
-      left="12"
-      top_pad="10"
-      height="132"
-      width="450">
-    <button
-        follows="left|top"
-        height="22"
-        label="Put Face Data Set"
-        layout="topleft"
-        name="put_set_button"
-        top_pad="0"
-        width="214"/>
-    <button
-        follows="left|top"
-        height="22"
-        label="Put Face Data Clear"
-        layout="topleft"
-        name="put_clear_button"
-        left_pad="20"
-        width="214"/>
-    <scroll_list
-        column_padding="0"
-        draw_heading="true"
+      <panel
+          border="false"
+          bevel_style="none"
+          follows="left|top|right"
+          layout="topleft"
+          height="167"
+          top_pad="10"
+          width="1220">
+        <button
+            follows="left|top"
+            height="22"
+            label="Get"
+            layout="topleft"
+            name="get_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"
+            tab_stop="false"
+            multi_select="true"
+            name="get_scroll_list"
+            width="1220">
+          <scroll_list.columns
+              label="Material ID"
+              name="id"
+              dynamic_width="true" />
+          <scroll_list.columns
+              label="Normal Map"
+              name="normal_map"
+              width="225" />
+          <scroll_list.columns
+              label="Specular Map"
+              name="specular_map"
+              width="225" />
+          <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>
+      </panel>
+    </panel>
+    <panel
+        border="true"
+        bevel_style="none"
         follows="left|top|right"
-        height="100"
         layout="topleft"
-        left="0"
+        label="Object editing"
+        height="167"
         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>
-  <view_border
-      bevel_style="none"
-      follows="left|right|top"
-      height="0"
-      layout="topleft"
-      name="horiz_separator"
-      top_pad="10"
-      left="12"
-      width="1220"/>
-  <panel
-      border="false"
-      bevel_style="none"
-      follows="left|top|right"
-      layout="topleft"
-      left="12"
-      top_pad="10"
-      height="132"
-      width="1220">
-    <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"
+        width="1220">
+      <panel
+          border="false"
+          bevel_style="none"
+          follows="left|top|right"
+          layout="topleft"
+          left="2"
+          top_pad="10"
+          height="410"
+          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="132"
+              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" />
+            <text
+                height="13"
+                word_wrap="false"
+                use_ellipses="false"
+                type="string"
+                text_color="LabelTextColor"
+                length="1"
+                follows="left|top"
+                layout="topleft"
+                left_pad="-200"
+                top_pad="10"
+                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="110"
+              width="450">
+            <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"/>
+          </panel>
+
+        </panel>
+        <view_border
+            bevel_style="none"
+            follows="left|right|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"
-        height="100"
         layout="topleft"
+        label="Viewable objects"
+        height="167"
         top_pad="10"
-        left="0"
-        tab_stop="false"
-        multi_select="true"
-        name="post_scroll_list"
         width="1220">
-      <scroll_list.columns
-          label="Material ID"
-          name="id"
-          dynamic_width="true" />
-      <scroll_list.columns
-          label="Normal Map"
-          name="normal_map"
-          width="225" />
-      <scroll_list.columns
-          label="Specular Map"
-          name="specular_map"
-          width="225" />
-      <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>
-  </panel>
-  </floater>
+      <panel
+          border="false"
+          bevel_style="none"
+          follows="left|top|right"
+          layout="topleft"
+          left="12"
+          top_pad="10"
+          height="132"
+          width="1220">
+        <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="100"
+            layout="topleft"
+            top_pad="10"
+            left="0"
+            tab_stop="false"
+            multi_select="true"
+            name="post_scroll_list"
+            width="1220">
+          <scroll_list.columns
+              label="Material ID"
+              name="id"
+              dynamic_width="true" />
+          <scroll_list.columns
+              label="Normal Map"
+              name="normal_map"
+              width="225" />
+          <scroll_list.columns
+              label="Specular Map"
+              name="specular_map"
+              width="225" />
+          <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>
+      </panel>
+    </panel>
+  </tab_container>
+</floater>