diff options
| author | McCabe Maxsted | 2009-10-12 00:55:19 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-10-12 00:55:19 -0700 |
| commit | fafee316d45b0bc90a1790b9bbe75cd2724d7bf7 (patch) | |
| tree | 03ff85c64d37151d91c47f792399336e2ff1c94c /linden/indra/newview/skins/default | |
| parent | Removed reference to 'Second Life' from postcard message a la Meerkat (diff) | |
| parent | Applied avatar height in customize window from Emerald viewer (diff) | |
| download | meta-impy-fafee316d45b0bc90a1790b9bbe75cd2724d7bf7.zip meta-impy-fafee316d45b0bc90a1790b9bbe75cd2724d7bf7.tar.gz meta-impy-fafee316d45b0bc90a1790b9bbe75cd2724d7bf7.tar.bz2 meta-impy-fafee316d45b0bc90a1790b9bbe75cd2724d7bf7.tar.xz | |
Merge branch '1.2.0-avheight' into 1.2.0-customize
Diffstat (limited to 'linden/indra/newview/skins/default')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_customize.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml index e7a7a7b..e02607c 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml | |||
| @@ -1057,6 +1057,24 @@ scratch and wear it. | |||
| 1057 | </tab_container> | 1057 | </tab_container> |
| 1058 | <scroll_container bottom="-476" follows="left|top|right|bottom" height="382" left="197" | 1058 | <scroll_container bottom="-476" follows="left|top|right|bottom" height="382" left="197" |
| 1059 | mouse_opaque="false" name="panel_container" opaque="false" width="292" /> | 1059 | mouse_opaque="false" name="panel_container" opaque="false" width="292" /> |
| 1060 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | ||
| 1061 | bottom="-400" drop_shadow_visible="true" follows="left|top" | ||
| 1062 | font="SansSerif" h_pad="0" halign="left" height="16" | ||
| 1063 | left="8" mouse_opaque="true" name="AvatarHeightText" v_pad="0" width="140"> | ||
| 1064 | Avatar Height: | ||
| 1065 | </text> | ||
| 1066 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | ||
| 1067 | bottom_delta="-18" drop_shadow_visible="true" follows="left|top" | ||
| 1068 | font="SansSerif" h_pad="0" halign="left" height="16" | ||
| 1069 | left="8" mouse_opaque="true" name="HeightText" v_pad="0" width="140"> | ||
| 1070 | Avatar Height | ||
| 1071 | </text> | ||
| 1072 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | ||
| 1073 | bottom_delta="-18" drop_shadow_visible="true" follows="left|top" | ||
| 1074 | font="SansSerif" h_pad="0" halign="left" height="16" | ||
| 1075 | left="8" mouse_opaque="true" name="HeightText2" v_pad="0" width="140"> | ||
| 1076 | Avatar Height2 | ||
| 1077 | </text> | ||
| 1060 | <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" | 1078 | <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" |
| 1061 | height="20" label="Close" label_selected="Close" mouse_opaque="true" | 1079 | height="20" label="Close" label_selected="Close" mouse_opaque="true" |
| 1062 | name="Close" right="-10" scale_image="true" width="100" /> | 1080 | name="Close" right="-10" scale_image="true" width="100" /> |