Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 23 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 b97b1e4..a8f699a 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
@@ -1121,4 +1121,27 @@ scratch and wear it.
              height="20" label="Make Outfit..." label_selected="Make Outfit..."
              mouse_opaque="true" name="Make Outfit" left="100" scale_image="true"
              width="100" />
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom="-400" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left="8" mouse_opaque="true" name="AvatarHeightText" v_pad="0" width="140">
+    Avatar Height:
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left="8" mouse_opaque="true" name="HeightText" v_pad="0" width="140">
+    Avatar Height
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left="8" mouse_opaque="true" name="HeightText2" v_pad="0" width="140">
+    Avatar Height2
+  </text>
+
+  <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" height="20" hidden="false" label="Export" label_selected="Export" right="-280" mouse_opaque="true" name="Export" scale_image="true" width="80" />
+  <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" height="20" hidden="false" label="Import" label_selected="Import" right="-370" mouse_opaque="true" name="Import" scale_image="true" width="80" />
+
 </floater>