From 8a576ea16fe6f887458a2001ab9b0e5d2b41f58a Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 16 Jan 2013 17:28:30 -0500
Subject: remove prototype access code used for server testing

---
 .../default/xui/en/floater_debug_materials.xml     | 995 ---------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  10 -
 2 files changed, 1005 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_debug_materials.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
deleted file mode 100644
index 3a450fdeff..0000000000
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ /dev/null
@@ -1,995 +0,0 @@
-<?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/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 721a1818dd..bbcf7bc3ef 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2622,16 +2622,6 @@
 
           <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
              label="Debug GL"
              name="Debug GL">
-- 
cgit v1.2.3


From 6c667b8c3372505b17385efaac7c0e758b29a1a7 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 28 Jan 2013 16:20:52 -0500
Subject: rename "Lighting and Shadows" (deferred rendering) to "Advanced
 Lighting Model"

---
 indra/newview/skins/default/xui/da/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/de/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml                 | 4 ++--
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 2 +-
 indra/newview/skins/default/xui/es/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/fr/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/it/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/ja/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/pl/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/pt/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/ru/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/tr/menu_viewer.xml                 | 2 +-
 indra/newview/skins/default/xui/zh/menu_viewer.xml                 | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index d695cd1f89..f2ed7c2e64 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -245,7 +245,7 @@
 		<menu label="Gengivelse" name="Rendering">
 			<menu_item_check label="Akser" name="Axes"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Lys og skygger" name="Lighting and Shadows"/>
+			<menu_item_check label="Lys og skygger" name="Advanced Lighting Model"/>
 			<menu_item_check label="Skygger fra sol/måne/andre lyskilder" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO og skygge udjævning" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Globalt lys (eksperimentiel)" name="Global Illumination"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 845df1f050..8277174cda 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -307,7 +307,7 @@
 			<menu_item_call label="Texturinfo für ausgewähltes Objekt" name="Selected Texture Info Basis"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
 			<menu_item_check label="Objekt-Objekt Okklusion" name="Object-Object Occlusion"/>
-			<menu_item_check label="Licht und Schatten" name="Lighting and Shadows"/>
+			<menu_item_check label="Licht und Schatten" name="Advanced Lighting Model"/>
 			<menu_item_check label="Schatten von Sonne-/Mond-Projektoren" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO und Schattenglättung" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Fehler in GL beseitigen" name="Debug GL"/>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index bbcf7bc3ef..7e21013cac 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2584,8 +2584,8 @@
           <menu_item_separator />
 
           <menu_item_check
-                       label="Lighting and Shadows"
-                       name="Lighting and Shadows">
+                       label="Advanced Lighting Model"
+                       name="Advanced Lighting Model">
             <menu_item_check.on_check
              function="CheckControl"
              parameter="RenderDeferred" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 849f3ef73d..e249d51d91 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -262,7 +262,7 @@
 		 control_name="RenderDeferred"
 		 height="16"
 		 initial_value="true"
-		 label="Lighting and Shadows"
+		 label="Advance Lighting Model"
 		 layout="topleft"
 		 left_delta="0"
 		 name="UseLightShaders"
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index d80150ef6d..9e0ac5115f 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -285,7 +285,7 @@
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Luces y sombras" name="Lighting and Shadows"/>
+			<menu_item_check label="Luces y sombras" name="Advanced Lighting Model"/>
 			<menu_item_check label="Sombras del sol/la luna/proyectores" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO y sombras suavizadas" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Capas alfa automáticas (deferidas)" name="Automatic Alpha Masks (deferred)"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 85020afe25..24bd6a2a95 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -307,7 +307,7 @@
 			<menu_item_call label="Base des infos de la texture sélectionnée" name="Selected Texture Info Basis"/>
 			<menu_item_check label="Filaire" name="Wireframe"/>
 			<menu_item_check label="Occlusion objet-objet" name="Object-Object Occlusion"/>
-			<menu_item_check label="Éclairage et ombres" name="Lighting and Shadows"/>
+			<menu_item_check label="Éclairage et ombres" name="Advanced Lighting Model"/>
 			<menu_item_check label="Ombres du soleil/de la lune/des projecteurs" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO et lissage des ombres" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Débogage GL" name="Debug GL"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 547c5a9b73..cdfa97bb3c 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -286,7 +286,7 @@
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Assi" name="Axes"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Luci e ombre" name="Lighting and Shadows"/>
+			<menu_item_check label="Luci e ombre" name="Advanced Lighting Model"/>
 			<menu_item_check label="Ombra dal sole, dalla luna e dai proiettori" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO e ombre fluide" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Maschera alfa automatica (differita)" name="Automatic Alpha Masks (deferred)"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index e60e6781c6..74859076c2 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -307,7 +307,7 @@
 			<menu_item_call label="選択したテクスチャ情報基底" name="Selected Texture Info Basis"/>
 			<menu_item_check label="ワイヤーフレーム" name="Wireframe"/>
 			<menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/>
-			<menu_item_check label="光と影" name="Lighting and Shadows"/>
+			<menu_item_check label="光と影" name="Advanced Lighting Model"/>
 			<menu_item_check label="太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO と影の平滑化" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="GL デバッグ" name="Debug GL"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 24c961fa26..e1725fc308 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -236,7 +236,7 @@
 		<menu label="Renderowanie" name="Rendering">
 			<menu_item_check label="Osie" name="Axes"/>
 			<menu_item_check label="Tryb obrazu szkieletowego" name="Wireframe"/>
-			<menu_item_check label="Oświetlenie i cienie" name="Lighting and Shadows"/>
+			<menu_item_check label="Oświetlenie i cienie" name="Advanced Lighting Model"/>
 			<menu_item_check label="Cienie Słońca/Księżyca/Projektory" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO and wygładzanie cienia" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Globalne oświetlenie (eksperymentalne)" name="Global Illumination"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index ca378c1b58..e8baff5af2 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -286,7 +286,7 @@
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Iluminação e sombras" name="Lighting and Shadows"/>
+			<menu_item_check label="Iluminação e sombras" name="Advanced Lighting Model"/>
 			<menu_item_check label="Sombras da projeção do sol/lua" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO e sombra suave" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Máscaras alpha automáticas (adiadas)" name="Automatic Alpha Masks (deferred)"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index d9425937c3..c292b8a287 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -305,7 +305,7 @@
 			<menu_item_call label="Выбранная текстура в основе" name="Selected Texture Info Basis"/>
 			<menu_item_check label="Каркас" name="Wireframe"/>
 			<menu_item_check label="Смыкание объектов" name="Object-Object Occlusion"/>
-			<menu_item_check label="Освещение и тени" name="Lighting and Shadows"/>
+			<menu_item_check label="Освещение и тени" name="Advanced Lighting Model"/>
 			<menu_item_check label="Тени от солнца, луны и прожекторов" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO и сглаживание теней" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Отладка GL" name="Debug GL"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 7a7faf6ac4..28f28db6d2 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -305,7 +305,7 @@
 			<menu_item_call label="Seçilen Doku Bilgi Temeli" name="Selected Texture Info Basis"/>
 			<menu_item_check label="Telkafes" name="Wireframe"/>
 			<menu_item_check label="Görünen Nesneler İçin Gölgeleme" name="Object-Object Occlusion"/>
-			<menu_item_check label="Işıklandırma ve Gölgeler" name="Lighting and Shadows"/>
+			<menu_item_check label="Işıklandırma ve Gölgeler" name="Advanced Lighting Model"/>
 			<menu_item_check label="Güneş/Ay/Projektörlerden Gelen Gölgeler" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO ve Gölge Yumuşatma" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="GL Hata Ayıklama" name="Debug GL"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index ac0e9e7e35..9a95e8c4d6 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -305,7 +305,7 @@
 			<menu_item_call label="已選取材質資訊基礎" name="Selected Texture Info Basis"/>
 			<menu_item_check label="線框" name="Wireframe"/>
 			<menu_item_check label="物件導向的遮蔽" name="Object-Object Occlusion"/>
-			<menu_item_check label="光線和陰影" name="Lighting and Shadows"/>
+			<menu_item_check label="光線和陰影" name="Advanced Lighting Model"/>
 			<menu_item_check label="來自日/月/投影物的陰影" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="屏幕空間環境光遮蔽和陰影平滑技術" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="GL 除錯" name="Debug GL"/>
-- 
cgit v1.2.3