New controls for editing media.

1 files changed, 184 insertions, 44 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 26b2d83351..21cbf9673d 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -155,36 +155,36 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             name="label shininess"
              left_pad="10"
+             name="label alphamode"
              text_readonly_color="LabelDisabledColor"
-             top_delta="6"
+             top_delta="0"
              width="90">
-                Shininess
+                Alpha mode
             </text>
             <combo_box
              height="23"
              layout="topleft"
-             left_pad="10"
-             name="combobox shininess"
-             top_delta="-6"
-             width="90">
+             left_delta="0"
+             name="combobox alphamode"
+             top_pad="4"
+             width="120">
                 <combo_box.item
                  label="None"
                  name="None"
                  value="None" />
                 <combo_box.item
-                 label="Low"
-                 name="Low"
-                 value="Low" />
+                 label="Alpha blending"
+                 name="Alpha blending"
+                 value="Alpha blending" />
                 <combo_box.item
-                 label="Medium"
-                 name="Medium"
-                 value="Medium" />
+                 label="Alpha masking"
+                 name="Alpha masking"
+                 value="Alpha masking" />
                 <combo_box.item
-                 label="High"
-                 name="High"
-                 value="High" />
+                 label="Emissive mask"
+                 name="Emissive mask"
+                 value="Emissive mask" />
             </combo_box>
             <text
              type="string"
@@ -192,7 +192,43 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left_delta="-100"
+             left_delta="0"
+             name="label maskcutoff"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="4"
+             width="90">
+                Mask cutoff
+            </text>
+            <spinner
+             decimal_digits="3"
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             layout="topleft"
+             top_pad="4"
+             left_delta="0"
+             name="maskcutoff"
+             width="80" />
+            <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="locked_image.j2c"
+             follows="left|top"
+             height="80"
+             label="Texture       "
+             layout="topleft"
+             left="10"
+             name="bumpytexture control"
+             tool_tip="Click to choose a picture"
+             top_delta="-55"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="10"
              name="label bumpiness"
              text_readonly_color="LabelDisabledColor"
              top_delta="0"
@@ -278,13 +314,142 @@
                  label="weave"
                  name="weave"
                  value="weave" />
+                <combo_box.item
+                 label="Use texture"
+                 name="Use texture"
+                 value="Use texture" />
+            </combo_box>
+            <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="locked_image.j2c"
+             follows="left|top"
+             height="80"
+             label="Texture       "
+             layout="topleft"
+             left="10"
+             name="shinytexture control"
+             tool_tip="Click to choose a picture"
+             top_delta="-14"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             name="label shininess"
+             left_pad="10"
+             text_readonly_color="LabelDisabledColor"
+             top_delta="6"
+             width="90">
+                Shininess
+            </text>
+            <combo_box
+             height="23"
+             layout="topleft"
+             left_pad="10"
+             name="combobox shininess"
+             top_delta="-6"
+             width="90">
+                <combo_box.item
+                 label="None"
+                 name="None"
+                 value="None" />
+                <combo_box.item
+                 label="Low"
+                 name="Low"
+                 value="Low" />
+                <combo_box.item
+                 label="Medium"
+                 name="Medium"
+                 value="Medium" />
+                <combo_box.item
+                 label="High"
+                 name="High"
+                 value="High" />
+                <combo_box.item
+                 label="Use texture"
+                 name="Use texture"
+                 value="Use texture" />
             </combo_box>
             <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="-100"
+             name="label glossiness"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="8"
+             width="116">
+                Glossiness
+            </text>
+            <spinner
+             decimal_digits="3"
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             layout="topleft"
+             top_delta="-4"
+             left_pad="10"
+             name="glossiness"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="-126"
+             name="label environment"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="8"
+             width="116">
+                Environment
+            </text>
+            <spinner
+             decimal_digits="3"
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             layout="topleft"
+             top_delta="-4"
+             left_pad="10"
+             name="environment"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="-126"
+             name="label shinycolor"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="8"
+             width="116">
+                Color
+            </text>
+            <!-- label is blank because control places it below the box -->
+            <color_swatch
+             can_apply_immediately="true"
+             follows="left|top"
+             height="45"
+             label=""
+             layout="topleft"
+             left_pad="10"
+             name="shinycolorswatch"
+             tool_tip="Click to open color picker"
+             top_delta="-4"
+             width="64" />
+            <text
 			 follows="left|top|right"
 			 height="9"
 			 layout="topleft"
 			 left="10"
-			 top_delta="-8"
+			 top_delta="-50"
              use_ellipses="true"
 			 read_only="true"
 			 name="media_info"
@@ -370,14 +535,6 @@
              name="TexScaleU"
              top_pad="5"
              width="265" />
-            <!-- <check_box
-             height="19"
-             label="Flip"
-             layout="topleft"
-             left_pad="5"
-             name="checkbox flip s"
-             top_delta="0"
-             width="70" /> -->
             <spinner
              follows="left|top"
              height="19"
@@ -390,14 +547,6 @@
              max_val="100"
              name="TexScaleV"
              width="265" />
-            <!-- <check_box
-             height="19"
-             label="Flip"
-             layout="topleft"
-             left_pad="5"
-             name="checkbox flip t"
-             top_delta="0"
-             width="70" /> -->
             <spinner
              decimal_digits="1"
              follows="left|top"
@@ -411,16 +560,7 @@
              min_val="0.1"
              name="rptctrl"
              width="265" />
-            <!-- <button
-             follows="left|top"
-             height="19"
-             label="Apply"
-             label_selected="Apply"
-             layout="topleft"
-             left_pad="5"
-             name="button apply"
-             width="75" /> -->
-            <spinner
+           <spinner
              decimal_digits="2"
              follows="left|top"
              height="19"