SL-10799 [Legacy Profiles] added 3x4 image dimentions support

1 files changed, 135 insertions, 105 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 1232439b1e..8ebb1522b4 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -129,118 +129,148 @@
      v_pad="2"
      max_length="254"
     />
-    <texture_picker
-     name="2nd_life_pic"
-     enabled="false"
+    <layout_stack
+     name="imagepositioner"
      top_pad="6"
      left_delta="0"
-     height="180"
-     width="180"
-     follows="top|left"
-     layout="topleft"
-     allow_no_texture="true"
-     default_image_name="None"
-     fallback_image="Generic_Person_Large"
-    />
-    <text
-     name="status"
-     value="Status Unknown"
-     top_delta="1"
-     left_pad="4"
-     right="-6"
-     height="16"
-     follows="top|left"
-     layout="topleft"
-     halign="center"
-     text_color="LtGray_50"
-    />
-    <text
-     name="label"
-     value="Second Life Birthdate:"
-     top_pad="2"
-     right="-6"
-     height="16"
-     follows="top|left"
-     layout="topleft"
-    />
-    <text_editor
-     name="register_date"
-     value="(loading...)"
-     top_pad="0"
-     left_delta="2"
-     right="-6"
-     height="16"
-     follows="top|left|right"
-     layout="topleft"
-     allow_scroll="false"
-     bg_visible="false"
-     border_visible="true"
-     h_pad="2"
-     max_length="254"
-     read_only="true"
-     translate="false"
-     v_pad="2"
-     word_wrap="true"
-    />
-    <text
-     name="label2"
-     value="Account:"
-     top_pad="5"
-     left_delta="-2"
-     right="-6"
-     height="16"
-     follows="top|left"
-     layout="topleft"
-    />
-    <text_editor
-     name="acc_status_text"
-     top_pad="0"
-     left_delta="2"
-     right="-6"
-     height="44"
-     follows="top|left|right"
-     layout="topleft"
-     allow_scroll="false"
-     bg_visible="false"
-     border_visible="true"
-     h_pad="2"
-     read_only="true"
-     translate="false"
-     v_pad="2"
-     word_wrap="true"
-    />
-    <text
-     name="partner_label"
-     value="Partner:"
-     top_pad="5"
-     left_delta="-2"
-     right="-6"
-     height="16"
-     follows="top|left"
-     layout="topleft"
-    />
-    <text_editor
-     name="partner_text"
-     top_pad="0"
-     left_delta="0"
-     right="-6"
-     height="20"
+     right="-1"
+     height="158"
      follows="top|left|right"
      layout="topleft"
-     allow_scroll="false"
-     bg_visible="false"
-     border_visible="true"
-     parse_urls="true"
-     h_pad="0"
-     read_only="true"
-     translate="false"
-     v_pad="2"
-     max_length="254"
-    />
+     orientation="horizontal"
+    >
+        <layout_panel
+         name="image_stack"
+         follows="all"
+         layout="topleft"
+         width="158"
+         height="158"
+         auto_resize="false"
+         user_resize="false"
+        >
+            <!-- 23 pixels (BTN_HEIGHT_SMALL) are reserved by label field of texture and shouldn't be visible-->
+            <texture_picker
+             name="2nd_life_pic"
+             enabled="false"
+             top="0"
+             left="0"
+             right="-1"
+             height="180"
+             follows="all"
+             layout="topleft"
+             allow_no_texture="true"
+             default_image_name="None"
+             fallback_image="Generic_Person_Large"
+             />
+        </layout_panel>
+        <layout_panel
+         name="label_stack"
+         follows="all"
+         layout="topleft"
+         auto_resize="true"
+         user_resize="false"
+        >
+            <text
+             name="status"
+             value="Status Unknown"
+             top="1"
+             left="4"
+             right="-6"
+             height="16"
+             follows="top|left"
+             layout="topleft"
+             halign="center"
+             text_color="LtGray_50"
+             />
+            <text
+             name="label"
+             value="Second Life Birthdate:"
+             top_pad="2"
+             right="-6"
+             height="16"
+             follows="top|left"
+             layout="topleft"
+             />
+            <text_editor
+             name="register_date"
+             value="(loading...)"
+             top_pad="0"
+             left_delta="2"
+             right="-6"
+             height="16"
+             follows="top|left|right"
+             layout="topleft"
+             allow_scroll="false"
+             bg_visible="false"
+             border_visible="true"
+             h_pad="2"
+             max_length="254"
+             read_only="true"
+             translate="false"
+             v_pad="2"
+             word_wrap="true"
+             />
+            <text
+             name="label2"
+             value="Account:"
+             top_pad="5"
+             left_delta="-2"
+             right="-6"
+             height="16"
+             follows="top|left"
+             layout="topleft"
+             />
+            <text_editor
+             name="acc_status_text"
+             top_pad="0"
+             left_delta="2"
+             right="-6"
+             height="44"
+             follows="top|left|right"
+             layout="topleft"
+             allow_scroll="false"
+             bg_visible="false"
+             border_visible="true"
+             h_pad="2"
+             read_only="true"
+             translate="false"
+             v_pad="2"
+             word_wrap="true"
+             />
+            <text
+             name="partner_label"
+             value="Partner:"
+             top_pad="5"
+             left_delta="-2"
+             right="-6"
+             height="16"
+             follows="top|left"
+             layout="topleft"
+             />
+            <text_editor
+             name="partner_text"
+             top_pad="0"
+             left_delta="0"
+             right="-6"
+             height="20"
+             follows="top|left|right"
+             layout="topleft"
+             allow_scroll="false"
+             bg_visible="false"
+             border_visible="true"
+             parse_urls="true"
+             h_pad="0"
+             read_only="true"
+             translate="false"
+             v_pad="2"
+             max_length="254"
+             />
+        </layout_panel>
+    </layout_stack>
     <text
      name="Groups:"
      value="Groups:"
-     top_pad="8"
+     top_pad="7"
      left="6"
      height="16"
      width="55"