summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2010-11-22 18:41:06 +0200
committerVadim ProductEngine <vsavchuk@productengine.com>2010-11-22 18:41:06 +0200
commit2333cb9cfd3edcf3481bf328129dfd8714afefc7 (patch)
tree673658a022cffdb70053173a7343859ef209197b /indra/newview/skins/default/xui/en
parent02701073ce70fc2e2043adf0ed7e0d6879669215 (diff)
STORM-500 FIXED Fixed resizing of "Edit Alpha" and "Edit Tattoo" panels.
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_alpha.xml24
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_tattoo.xml2
2 files changed, 19 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
index 7bcd4962d2..813aa5d7a9 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
@@ -8,6 +8,17 @@
name="edit_alpha_panel"
top_pad="10"
width="333" >
+ <scroll_container
+ color="DkGray2"
+ follows="all"
+ height="400"
+ layout="topleft"
+ left="10"
+ top_pad="0"
+ name="avatar_alpha_color_panel_scroll"
+ reserve_scroll_corner="false"
+ opaque="true"
+ width="313">
<panel
border="false"
bg_alpha_color="DkGray2"
@@ -16,14 +27,14 @@
background_opaque="true"
follows="top|left|right"
height="400"
- left="10"
+ left="0"
layout="topleft"
name="avatar_alpha_color_panel"
top="0"
width="313" >
<check_box
control_name="LowerAlphaTextureInvisible"
- follows="left"
+ follows="left|top"
height="16"
layout="topleft"
left="5"
@@ -48,7 +59,7 @@
<check_box
control_name="UpperAlphaTextureInvisible"
- follows="left"
+ follows="left|top"
height="16"
layout="topleft"
left_pad="20"
@@ -73,7 +84,7 @@
<check_box
control_name="HeadAlphaTextureInvisible"
- follows="left"
+ follows="left|top"
height="16"
layout="topleft"
left="5"
@@ -98,7 +109,7 @@
<check_box
control_name="Eye AlphaTextureInvisible"
- follows="left"
+ follows="left|top"
height="16"
layout="topleft"
left_pad="20"
@@ -123,7 +134,7 @@
<check_box
control_name="HairAlphaTextureInvisible"
- follows="left"
+ follows="left|top"
height="16"
layout="topleft"
left="5"
@@ -147,5 +158,6 @@
</texture_picker>
</panel>
+ </scroll_container>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
index 23a08344ea..97f1a1a658 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
@@ -14,7 +14,7 @@
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
- follows="top|left|right"
+ follows="all"
height="400"
left="10"
layout="topleft"