From dfc75e94141d8abd1fc288920a5fd8ffaeda041b Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Wed, 3 Oct 2012 18:24:39 -0700
Subject: Renaming the XUI files for floater_stinson to
 floater_debug_materials.

---
 .../default/xui/en/floater_debug_materials.xml     | 270 ++++++++++++++++++++
 .../skins/default/xui/en/floater_stinson.xml       | 271 ---------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |   2 +-
 3 files changed, 271 insertions(+), 272 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_debug_materials.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_stinson.xml

(limited to 'indra/newview/skins')

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..d7ec5d5e7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    positioning="cascading"
+    can_tear_off="false"
+    can_resize="true"
+    height="575"
+    width="1244"
+    min_height="600"
+    min_width="1100"
+    layout="topleft"
+    name="debug_materials"
+    reuse_instance="true"
+    save_rect="false"
+    single_instance="true"
+    title="Stinson Test">
+  <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>
+  <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>
+  <view_border
+      bevel_style="none"
+      follows="left|right|top"
+      height="0"
+      layout="topleft"
+      name="horiz_separator"
+      top_pad="0"
+      left="12"
+      width="1220"/>
+  <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>
+  <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"
+        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>
+  <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"
+        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>
+  </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_stinson.xml b/indra/newview/skins/default/xui/en/floater_stinson.xml
deleted file mode 100644
index b152dd5fc8..0000000000
--- a/indra/newview/skins/default/xui/en/floater_stinson.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-    positioning="cascading"
-    can_tear_off="false"
-    can_resize="true"
-    height="575"
-    width="1244"
-    min_height="600"
-    min_width="1100"
-    layout="topleft"
-    name="floater_stinson"
-    help_topic="floater_stinson"
-    reuse_instance="true"
-    save_rect="false"
-    single_instance="true"
-    title="Stinson Test">
-  <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>
-  <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>
-  <view_border
-      bevel_style="none"
-      follows="left|right|top"
-      height="0"
-      layout="topleft"
-      name="horiz_separator"
-      top_pad="0"
-      left="12"
-      width="1220"/>
-  <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>
-  <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"
-        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>
-  <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"
-        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>
-  </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e94253fcf6..785ae8f366 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -994,7 +994,7 @@
           name="StinsonMenu">
         <menu_item_call.on_click
             function="Floater.ToggleOrBringToFront"
-            parameter="floater_stinson" />
+            parameter="debug_materials" />
       </menu_item_call>
 
       <menu_item_separator/>
-- 
cgit v1.2.3