Merge

1 files changed, 408 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
new file mode 100644
index 0000000000..4112b65635
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="all"
+ height="535"
+ label="Profile"
+ layout="topleft"
+ left="0"
+ name="panel_profile"
+ top="0"
+ width="315">
+    <string
+     name="CaptionTextAcctInfo">
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+    </string>
+    <string
+     name="payment_update_link_url">
+        http://www.secondlife.com/account/billing.php?lang=en
+    </string>
+    <string
+     name="partner_edit_link_url">
+        http://www.secondlife.com/account/partners.php?lang=en
+    </string>
+    <string
+     name="my_account_link_url"
+     value="http://secondlife.com/account" />
+    <string
+     name="no_partner_text"
+     value="None" />
+    <string
+     name="no_group_text"
+     value="None" />
+    <string
+	 name="RegisterDateFormat">
+	 [REG_DATE] ([AGE])
+	</string>
+    <layout_stack
+     name="layout"
+     orientation="vertical"
+     follows="all"
+     layout="topleft"
+     left="0"
+     top="0"
+     height="522"
+     width="315"
+     border_size="0">
+      <layout_panel
+         name="profile_stack"
+         follows="all"
+         layout="topleft"
+         top="0"
+         left="0"
+         height="492"
+         user_resize="false"
+         width="315">
+        <scroll_container
+         color="DkGray2"
+         follows="all"
+         layout="topleft"
+         left="0"
+         name="profile_scroll"
+         opaque="true"
+         height="488"
+         width="315"
+         top="0">
+          <panel
+                layout="topleft"
+          follows="left|top|right"
+                height="488"
+               name="scroll_content_panel"
+                top="0"
+                left="0"
+                width="297">
+            <panel
+                  follows="left|top|right"
+                  height="117"
+                  layout="topleft"
+                  left="10"
+                  name="second_life_image_panel"
+                  top="0"
+                  width="297">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               follows="top|left"
+               height="124"
+               layout="topleft"
+               left="3"
+               name="2nd_life_pic"
+               top="10"
+               width="102" />
+              <icon
+              height="102"
+              image_name="Blank"
+              layout="topleft"
+              name="2nd_life_edit_icon"
+              label=""
+              left="3"
+              tool_tip="Click the Edit Profile button below to change image"
+              top="10"
+              width="102" />
+              <text
+               follows="left|top|right"
+         font.style="BOLD"
+               height="15"
+               layout="topleft"
+               left_pad="10"
+               name="title_sl_descr_text"
+               text_color="white"
+               top_delta="0"
+               value="[SECOND_LIFE]:"
+               width="180" />
+              <expandable_text
+               follows="left|top|right"
+               height="95"
+               layout="topleft"
+               left="107"
+               textbox.max_length="512"
+               name="sl_description_edit"
+               top_pad="-3"
+               translate="false"
+               width="181"
+               expanded_bg_visible="true"
+               expanded_bg_color="DkGray">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+              </expandable_text>
+            </panel>
+            <panel
+             follows="left|top|right"
+             height="117"
+             layout="topleft"
+       top_pad="0"
+             left="10"
+             name="first_life_image_panel"
+             width="297">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               follows="top|left"
+               height="124"
+               layout="topleft"
+               left="3"
+               name="real_world_pic"
+               width="102" />
+              <icon
+              height="102"
+              image_name="Blank"
+              layout="topleft"
+              name="real_world_edit_icon"
+              label=""
+              left="3"
+              tool_tip="Click the Edit Profile button below to change image"
+              top="4"
+              width="102" />
+              <text
+               follows="left|top|right"
+         font.style="BOLD"
+               height="15"
+               layout="topleft"
+               left_pad="10"
+               name="title_rw_descr_text"
+               text_color="white"
+               top_delta="0"
+               value="Real World:"
+               width="180" />
+              <expandable_text
+               follows="left|top|right"
+               height="95"
+               layout="topleft"
+               left="107"
+               textbox.max_length="512"
+               name="fl_description_edit"
+               top_pad="-3"
+               translate="false"
+               width="181"
+               expanded_bg_visible="true"
+               expanded_bg_color="DkGray">
+                Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+              </expandable_text>
+            </panel>
+            <text
+             follows="left|top"
+             height="15"
+       font.style="BOLD"
+       font="SansSerifMedium"
+             layout="topleft"
+             left="10"
+             name="homepage_edit"
+             top_pad="0"
+             translate="false"
+             value="http://librarianavengers.org"
+             width="300"
+             word_wrap="false"
+             use_ellipses="true"
+         />
+            <text
+             follows="left|top"
+           font.style="BOLD"
+             height="10"
+             layout="topleft"
+             left="10"
+             name="title_member_text"
+             text_color="white"
+             top_pad="10"
+             value="Resident Since:"
+             width="300" />
+            <text_editor
+             allow_scroll="false"
+             bg_visible="false"
+             follows="left|top"
+             h_pad="0"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="register_date"
+             read_only="true"
+             translate="false"
+             v_pad="0"
+             value="05/31/2376"
+             width="300"
+             word_wrap="true" />
+            <text
+             follows="left|top"
+       font.style="BOLD"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="title_acc_status_text"
+             text_color="white"
+             top_pad="5"
+             value="Account Status:"
+             width="300" />
+            <!-- <text
+         type="string"
+         follows="left|top"
+         font="SansSerifSmall"
+         height="15"
+         layout="topleft"
+         left_pad="10"
+         name="my_account_link"
+         top_delta="0"
+	 value="Go to Dashboard"
+         width="100"/> -->
+            <text_editor
+            allow_scroll="false"
+            bg_visible="false"
+            follows="left|top"
+            h_pad="0"
+            height="28"
+            layout="topleft"
+            left="10"
+            name="acc_status_text"
+            read_only="true"
+            top_pad="0"
+            translate="false"
+            v_pad="0"
+            width="300"
+            word_wrap="true">
+              Resident. No payment info on file.
+              Linden.
+            </text_editor>
+            <text
+             follows="left|top"
+       font.style="BOLD"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="title_partner_text"
+             text_color="white"
+             top_pad="3"
+             value="Partner:"
+             width="300" />
+            <panel
+             follows="left|top"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="partner_data_panel"
+             top_pad="0"
+             width="300">
+              <name_box
+               follows="left|top"
+               height="10"
+               initial_value="(retrieving)"
+               layout="topleft"
+               left="0"
+               link="true"
+               name="partner_text"
+               top="0"
+           width="300"
+               word_wrap="true" />
+            </panel>
+            <text
+             follows="left|top"
+       font.style="BOLD"
+             height="13"
+             layout="topleft"
+             left="10"
+             name="title_groups_text"
+             text_color="white"
+             top_pad="3"
+             value="Groups:"
+             width="300" />
+            <expandable_text
+            follows="all"
+            height="113"
+            layout="topleft"
+            left="7"
+            name="sl_groups"
+          top_pad="0"
+            translate="false"
+            width="298"
+            expanded_bg_visible="true"
+            expanded_bg_color="DkGray">
+              Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
+            </expandable_text>
+          </panel>
+        </scroll_container>
+      </layout_panel>
+      <!-- <layout_panel
+     follows="bottom|left"
+     layout="topleft"
+     left="0"
+     name="profile_buttons_panel"
+     height="28"
+     width="313">
+         <button
+         follows="bottom|left"
+         height="23"
+         label="Add Friend"
+         layout="topleft"
+         left="0"
+         mouse_opaque="false"
+         name="add_friend"
+         tool_tip="Offer friendship to the Resident"
+         top="5"
+         width="80" />
+        <button
+         follows="bottom|left"
+         height="23"
+         label="IM"
+         layout="topleft"
+         name="im"
+         top="5"
+         left_pad="3"
+         width="45" />
+        <button
+         follows="bottom|left"
+         height="23"
+         label="Call"
+         layout="topleft"
+         name="call"
+         left_pad="3"
+         top="5"
+         width="45" />
+        <button
+         enabled="false"
+         follows="bottom|left"
+         height="23"
+         label="Map"
+         layout="topleft"
+         name="show_on_map_btn"
+         top="5"
+         left_pad="3"
+         width="45" />
+        <button
+         follows="bottom|left"
+         height="23"
+         label="Teleport"
+         layout="topleft"
+         name="teleport"
+         left_pad="3"
+         top="5"
+         width="85" />
+ </panel>-->
+ <layout_panel
+     follows="bottom|left"
+     layout="topleft"
+     left="0"
+     top_pad="0"
+     name="profile_me_buttons_panel"
+     visible="false"
+     user_resize="false" 
+     auto_resize="false" 
+     height="28"
+     width="315">
+        <button
+         follows="bottom|right"
+         height="23"
+         left="6"
+	 top="1"
+         label="Edit Profile"
+         name="edit_profile_btn"
+         tool_tip="Edit your personal information"
+         width="152" />
+        <button
+         follows="bottom|right"
+         height="23"
+         label="Edit Appearance"
+         left_pad="3"
+         name="edit_appearance_btn"
+         tool_tip="Create/edit your appearance: physical data, clothes and etc."
+         width="153" />
+ </layout_panel>
+</layout_stack>
+</panel>