diff options
author | Oz Linden <oz@lindenlab.com> | 2013-01-30 10:30:17 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-01-30 10:30:17 -0500 |
commit | 577515e93f122fe64cbf06913b8bacddee96ad22 (patch) | |
tree | e5d89a1abc62228035b2c645209ebfb2c855eabb /indra/newview/skins/default/xui/en | |
parent | 2968478a6aafaf54c93f91d483386a124d954391 (diff) | |
parent | ada2d07572ca51159004eec82721d3dabe735bb8 (diff) |
merge build floater updates
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 136 |
1 files changed, 134 insertions, 2 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 21cbf9673d..8382ad69d1 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -200,10 +200,12 @@ Mask cutoff </text> <spinner - decimal_digits="3" + decimal_digits="0" + min_val="0" + max_val="255" follows="left|top" height="19" - initial_value="0" + initial_value="55" layout="topleft" top_pad="4" left_delta="0" @@ -388,6 +390,8 @@ </text> <spinner decimal_digits="3" + min_value="0" + max_value="1" follows="left|top" height="19" initial_value="0" @@ -411,6 +415,8 @@ </text> <spinner decimal_digits="3" + min_value="0" + max_value="1" follows="left|top" height="19" initial_value="0" @@ -597,6 +603,132 @@ min_val="-1" name="TexOffsetV" width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Horizontal scale" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="bumpyScaleU" + top_delta="-115" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Vertical scale" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="bumpyScaleV" + width="265" /> + <spinner + decimal_digits="2" + follows="left|top" + height="19" + top_pad="27" + increment="1" + initial_value="0" + label="Rotation degrees" + layout="topleft" + label_width="205" + left="10" + max_val="9999" + min_val="-9999" + name="bumpyRot" + width="265" /> + + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Horizontal offset" + label_width="205" + layout="topleft" + left="10" + min_val="-1" + name="bumpyOffsetU" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Vertical offset" + label_width="205" + layout="topleft" + left="10" + min_val="-1" + name="bumpyOffsetV" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Horizontal scale" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="shinyScaleU" + top_delta="-115" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Vertical scale" + label_width="205" + layout="topleft" + left="10" + min_val="-100" + max_val="100" + name="shinyScaleV" + width="265" /> + <spinner + decimal_digits="2" + follows="left|top" + height="19" + top_pad="27" + increment="1" + initial_value="0" + label="Rotation degrees" + layout="topleft" + label_width="205" + left="10" + max_val="9999" + min_val="-9999" + name="shinyRot" + width="265" /> + + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Horizontal offset" + label_width="205" + layout="topleft" + left="10" + min_val="-1" + name="shinyOffsetU" + width="265" /> + <spinner + follows="left|top" + height="19" + initial_value="0" + label="Vertical offset" + label_width="205" + layout="topleft" + left="10" + min_val="-1" + name="shinyOffsetV" + width="265" /> <check_box follows="top|left" height="16" |