summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-05-22 16:13:54 -0400
committerOz Linden <oz@lindenlab.com>2013-05-22 16:13:54 -0400
commiteff106ae6887b19772eb97f5dc1898e559a48bd8 (patch)
tree534a5843f40382c6d6c1f6bc89e8d4bb1ee28fa6
parent74ea01d6f21444cdf2e867b109bb00516d85d7d9 (diff)
parentb3000136b852694a057c6e3c1d5b2e8e36f7c5e5 (diff)
merge latest integration changes
-rw-r--r--indra/newview/skins/default/xui/en/panel_tools_texture.xml8
1 files changed, 4 insertions, 4 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 626115bd5d..d3a9437063 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -644,8 +644,8 @@
layout="topleft"
label_width="205"
left="10"
- max_val="9999"
- min_val="-9999"
+ max_val="360"
+ min_val="0"
name="bumpyRot"
width="265" />
@@ -707,8 +707,8 @@
layout="topleft"
label_width="205"
left="10"
- max_val="9999"
- min_val="-9999"
+ max_val="360"
+ min_val="0"
name="shinyRot"
width="265" />