diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index f93979d70d338fd0ad63e1dc885b46b94f4d9323..c0366437db4f00b09901b8a4dd44f610e9fda096 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -29,42 +29,18 @@
top="0"
left="0"
width="240"
- height="575">
- <text
- top="16"
- left="11"
- height="20"
- follows="left|top"
- font="SansSerifHugeBold"
- layout="topleft"
- name="title_text"
- text_color="white"
- width="250">
- Edit Profile
- </text>
+ height="760">
<panel
background_visible="true"
bg_alpha_color="DkGray2"
follows="left|top|right|bottom"
- height="604"
+ height="620"
layout="topleft"
- left="9"
+ left="0"
name="data_panel"
top_pad="10"
width="260">
- <text
- top_pad="5"
- left="9"
- height="20"
- follows="left|top"
- font="SansSerifBigBold"
- layout="topleft"
- name="name_text"
- text_color="white"
- width="350">
- [FIRST] [LAST]
- </text>
- <panel
+ <panel
follows="left|top"
height="120"
layout="topleft"
@@ -73,7 +49,7 @@
top_pad="10"
width="265">
<panel
- height="120"
+ height="137"
layout="topleft"
left="0"
name="second_life_image_panel"
@@ -83,170 +59,324 @@
type="string"
length="1"
follows="left|top|right|bottom"
- font="SansSerifBold"
- height="20"
+ font="SansSerifSmall"
+ font.style="BOLD"
+ height="15"
layout="topleft"
left="0"
name="second_life_photo_title_text"
text_color="white"
top="0"
- width="125">
- [SECOND_LIFE] photo:
+ width="240">
+ [SECOND_LIFE]:
</text>
<texture_picker
allow_no_texture="true"
default_image_name="None"
follows="top|left"
- height="105"
+ height="117"
layout="topleft"
left="0"
name="2nd_life_pic"
top_pad="5"
- width="125" />
+ width="102" />
</panel>
- <panel
- height="120"
+ <icon
+ height="16"
+ image_name="image_edit_icon.tga"
+ layout="topleft"
+ left="75"
+ name="2nd_life_edit_icon"
+ tool_tip="Click to select an image"
+ top="35"
+ width="16" />
+ </panel>
+ <text_editor
+ type="string"
+ length="1"
+ follows="left|top|right"
+ font="SansSerifSmall"
+ height="125"
+ layout="topleft"
+ left="120"
+ top="30"
+ name="sl_description_edit"
+ width="115"
+ word_wrap="true">
+ </text_editor>
+ <panel
+ height="137"
layout="topleft"
- left_pad="10"
+ left="10"
name="first_life_image_panel"
- top="0"
+ top_pad="20"
width="125">
<text
type="string"
length="1"
follows="left|top|right|bottom"
- font="SansSerifBold"
- height="20"
+ font="SansSerifSmall"
+ font.style="BOLD"
+ height="15"
layout="topleft"
left="0"
name="real_world_photo_title_text"
text_color="white"
top="0"
width="125">
- Real World photo:
+ Real World:
</text>
<texture_picker
allow_no_texture="true"
default_image_name="None"
follows="top|left"
- height="105"
+ height="117"
layout="topleft"
left="0"
name="real_world_pic"
top_pad="5"
- width="125" />
+ width="102" />
</panel>
- <icon
- height="16"
- image_name="image_edit_icon.tga"
- layout="topleft"
- left="75"
- name="2nd_life_edit_icon"
- tool_tip="Click to select an image"
- top="35"
- width="16" />
- <icon
+ <icon
height="16"
image_name="image_edit_icon.tga"
layout="topleft"
- left="200"
+ left="85"
name="real_world_edit_icon"
tool_tip="Click to select an image"
- top="35"
+ top="210"
width="16" />
- </panel>
- <text
- type="string"
- length="1"
- follows="left|top"
- font="SansSerifBold"
- height="15"
- layout="topleft"
- left="9"
- name="title_sl_descr_text"
- text_color="white"
- top_pad="10"
- width="220">
- [SECOND_LIFE] description:
- </text>
- <text_editor
+ <text_editor
type="string"
length="1"
follows="left|top|right"
font="SansSerifSmall"
- height="120"
+ height="125"
layout="topleft"
- left="9"
- name="sl_description_edit"
- text_color="0.1 0.1 0.1 1"
- width="220"
- word_wrap="true">
- </text_editor>
- <text
- type="string"
- length="1"
- follows="left|top"
- font="SansSerifBold"
- height="15"
- layout="topleft"
- left="9"
- name="title_rw_descr_text"
- text_color="white"
- top_pad="10"
- width="220">
- Real World description:
- </text>
- <text_editor
- type="string"
- length="1"
- follows="left|top|right"
- font="SansSerifSmall"
- height="120"
- layout="topleft"
- left="9"
+ left="120"
+ top="195"
name="fl_description_edit"
- text_color="0.1 0.1 0.1 1"
- width="220"
+ width="115"
word_wrap="true">
</text_editor>
+ <text
+ type="string"
+ follows="left|top"
+ font="SansSerifSmall"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left="10"
+ name="online_me_status_text"
+ text_color="white"
+ top_pad="20"
+ width="255">
+ Status:
+ </text>
+ <combo_box
+ font="SansSerifSmall"
+ follows="left|top"
+ height="18"
+ layout="topleft"
+ left="10"
+ top_pad="5"
+ name="status_combo"
+ width="140">
+ <combo_box.item
+ label="Online"
+ name="online"
+ value="online" />
+ <combo_box.item
+ label="Away"
+ name="away"
+ value="away" />
+ <combo_box.item
+ label="Busy"
+ name="busy"
+ value="busy" />
+ </combo_box>
<text
type="string"
length="1"
follows="left|top"
- font="SansSerifBold"
+ font="SansSerifSmall"
+ font.style="BOLD"
height="15"
layout="topleft"
- left="9"
+ left="10"
name="title_homepage_text"
text_color="white"
- top_pad="10"
- width="100">
+ top_pad="20"
+ width="240">
Homepage:
</text>
<line_editor
follows="left|top|right"
- font="SansSerif"
- font.style="UNDERLINE"
+ font="SansSerifSmall"
height="20"
layout="topleft"
left="9"
name="homepage_edit"
- text_color="0.2 0.2 1 1"
width="220">
TODO
</line_editor>
<check_box
follows="left|top"
- font="SansSerifBold"
+ font="SansSerifSmall"
label="Show me in Search results"
layout="topleft"
- left="9"
+ left="10"
name="show_in_search_checkbox"
height="16"
text_enabled_color="white"
- top_pad="10"
- width="250"/>
- </panel>
+ top_pad="20"
+ width="240"/>
+ <text
+ follows="left|top"
+ font="SansSerifSmall"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left="10"
+ name="title_acc_status_text"
+ text_color="white"
+ top_pad="15"
+ value="Account Status:"
+ width="100" />
+ <link
+ type="string"
+ follows="left|top"
+ font="SansSerifSmall"
+ font.style="UNDERLINE"
+ height="15"
+ layout="topleft"
+ left_pad="10"
+ name="my_account_link"
+ top_delta="0"
+ value="Go to Dashboard"
+ width="100"/>
+ <text
+ follows="left|top|right"
+ height="15"
+ layout="topleft"
+ left="10"
+ name="acc_status_text"
+ top_pad="5"
+ value="Resident. No payment info on file."
+ width="255"
+ word_wrap="true" />
+ <text
+ follows="left|top"
+ font="SansSerifSmall"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left="10"
+ name="title_partner_text"
+ text_color="white"
+ top_pad="15"
+ value="Partner:"
+ width="100" />
+ <link
+ follows="left|top"
+ height="15"
+ font.style="UNDERLINE"
+ layout="topleft"
+ left_pad="10"
+ name="partner_edit_link"
+ top_delta="0"
+ value="Edit"
+ width="100" />
+ <panel
+ follows="left|top|right"
+ height="15"
+ layout="topleft"
+ left="10"
+ name="partner_data_panel"
+ top_pad="10"
+ width="255">
+ <text
+ follows="left|top|right"
+ height="30"
+ layout="topleft"
+ left="0"
+ name="partner_text"
+ top="0"
+ value="[FIRST] [LAST]"
+ width="240"
+ word_wrap="true" />
+ </panel>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ font="SansSerifSmall"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left="10"
+ name="title_afk_text"
+ text_color="white"
+ top_pad="15"
+ width="240">
+ Away Timeout:
+ </text>
+ <spinner
+ control_name="AFKTimeout"
+ decimal_digits="0"
+ follows="left|top"
+ height="16"
+ increment="1"
+ initial_value="300"
+ label=""
+ label_width="0"
+ layout="topleft"
+ left="10"
+ max_val="600"
+ min_val="30"
+ name="afk_timeout_spinner"
+ top_pad="5"
+ width="50" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left_pad="10"
+ name="seconds_textbox"
+ top_delta="0"
+ width="128">
+ seconds
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ font.style="BOLD"
+ left="12"
+ mouse_opaque="false"
+ name="text_box3"
+ top_pad="25"
+ width="240">
+ Busy Mode Response:
+ </text>
+ <text_editor
+ control_name="BusyModeResponse2"
+ commit_on_focus_lost = "true"
+ follows="left|top"
+ height="70"
+ layout="topleft"
+ left="12"
+ name="busy_response"
+ top_pad="10"
+ width="240"
+ word_wrap="true">
+ log_in_to_change
+ </text_editor>
+ </panel>
</panel>
</scroll_container>
<panel
@@ -272,10 +402,10 @@
height="25"
label="Cancel"
layout="topleft"
- right="-1"
+ left_pad="5"
name="cancel_btn"
top_delta="0"
- width="105" />
+ width="130" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 01f0a84e13f0f46e88e915dcc40770021516c5cb..01602dc906c29e5f6a1d0a99b90e708da554dc33 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -74,7 +74,7 @@
height="780">
<panel
follows="left|top"
- height="125"
+ height="117"
layout="topleft"
left="10"
name="second_life_image_panel"
@@ -85,15 +85,16 @@
default_image_name="None"
enabled="false"
follows="top|left"
- height="125"
+ height="117"
layout="topleft"
left="0"
name="2nd_life_pic"
top="10"
- width="125" />
+ width="102" />
<text
follows="left|top|right"
- font="SansSerifBold"
+ font="SansSerifSmall"
+ font.style="BOLD"
height="15"
layout="topleft"
left_pad="10"
@@ -101,10 +102,10 @@
text_color="white"
top_delta="0"
value="[SECOND_LIFE]:"
- width="140" />
+ width="130" />
<text
follows="left|top|right"
- height="90"
+ height="70"
layout="topleft"
name="sl_description_edit"
width="130"
@@ -114,8 +115,9 @@
</panel>
<panel
follows="left|top"
- height="125"
+ height="117"
layout="topleft"
+ top_pad="10"
left="10"
name="first_life_image_panel"
width="260">
@@ -124,14 +126,15 @@
default_image_name="None"
enabled="false"
follows="top|left"
- height="125"
+ height="117"
layout="topleft"
left="0"
name="real_world_pic"
- width="125" />
+ width="102" />
<text
follows="left|top|right"
- font="SansSerifBold"
+ font="SansSerifSmall"
+ font.style="BOLD"
height="15"
layout="topleft"
left_pad="10"
@@ -139,10 +142,10 @@
text_color="white"
top_delta="0"
value="Real World:"
- width="140" />
+ width="130" />
<text
follows="left|top|right"
- height="90"
+ height="70"
layout="topleft"
name="fl_description_edit"
width="130"
@@ -150,136 +153,117 @@
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.
</text>
</panel>
+ <text
+ type="string"
+ follows="left|top"
+ font="SansSerifSmall"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left="10"
+ name="me_homepage_text"
+ text_color="white"
+ top_pad="10"
+ width="255">
+ Homepage:
+ </text>
<link
follows="left|top|right"
height="15"
- hover_color="0.5 0.4 1 1"
layout="topleft"
+ font.style="UNDERLINE"
left="10"
name="homepage_edit"
- text_color="HTMLLinkColor"
top_pad="5"
value="http://librarianavengers.org"
- width="265"
- word_wrap="true" />
+ width="225"
+ word_wrap="false" />
<text
follows="left|top"
- font="SansSerifBold"
- halign="right"
+ font="SansSerifSmall"
+ font.style="BOLD"
height="15"
layout="topleft"
left="10"
name="title_member_text"
text_color="white"
- top_pad="10"
- value="Member since:"
- width="100" />
+ top_pad="20"
+ value="Member Since:"
+ width="255" />
<text
follows="left|top|right"
height="15"
layout="topleft"
- left_pad="10"
+ left="10"
name="register_date"
- top_delta="0"
+ top_pad="5"
value="05/31/1976"
width="160"
word_wrap="true" />
<text
follows="left|top"
- font="SansSerifBold"
- halign="right"
+ font="SansSerifSmall"
+ font.style="BOLD"
height="15"
layout="topleft"
left="10"
name="title_acc_status_text"
text_color="white"
- top_pad="20"
- value="Status:"
+ top_pad="15"
+ value="Account Status:"
width="100" />
+ <link
+ type="string"
+ follows="left|top"
+ font="SansSerifSmall"
+ font.style="UNDERLINE"
+ height="15"
+ layout="topleft"
+ left_pad="10"
+ name="my_account_link"
+ top_delta="0"
+ value="Go to Dashboard"
+ width="100"/>
<text
follows="left|top|right"
- height="30"
+ height="15"
layout="topleft"
- left_pad="10"
+ left="10"
name="acc_status_text"
- top_delta="0"
+ top_pad="5"
value="Resident. No payment info on file."
- width="160"
+ width="255"
word_wrap="true" />
- <spinner
- control_name="AFKTimeout"
- decimal_digits="0"
- follows="left|top"
- height="16"
- increment="1"
- initial_value="300"
- label="Away Timeout:"
- label_width="141"
- layout="topleft"
- left="10"
- max_val="600"
- min_val="30"
- name="afk_timeout_spinner"
- top_pad="10"
- width="202" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="220"
- name="seconds_textbox"
- top_delta="0"
- width="128">
- seconds
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="12"
- mouse_opaque="false"
- name="text_box3"
- top_pad="10"
- width="128">
- Busy Mode Response:
- </text>
- <text_editor
- control_name="BusyModeResponse2"
- commit_on_focus_lost = "true"
- follows="left|top"
- height="70"
- layout="topleft"
- left="12"
- name="busy_response"
- top_pad="5"
- width="250"
- word_wrap="true">
- log_in_to_change
- </text_editor>
<text
follows="left|top"
- font="SansSerifBold"
- halign="right"
+ font="SansSerifSmall"
+ font.style="BOLD"
height="15"
layout="topleft"
left="10"
name="title_partner_text"
text_color="white"
- top_pad="20"
+ top_pad="15"
value="Partner:"
width="100" />
+ <link
+ follows="left|top"
+ height="15"
+ font.style="UNDERLINE"
+ layout="topleft"
+ left_pad="10"
+ name="partner_edit_link"
+ top_delta="0"
+ value="Edit"
+ width="100" />
<panel
follows="left|top|right"
- height="50"
+ height="15"
layout="topleft"
- left_pad="10"
+ left="10"
name="partner_data_panel"
- top_delta="0"
- width="125">
+ top_pad="10"
+ width="255">
<text
follows="left|top|right"
height="30"
@@ -288,74 +272,28 @@
name="partner_text"
top="0"
value="[FIRST] [LAST]"
- width="160"
+ width="240"
word_wrap="true" />
- <link
- follows="top|right"
- height="15"
- hover_color="0.5 0.4 1 1"
- layout="topleft"
- left_delta="0"
- name="partner_edit_link"
- text_color="HTMLLinkColor"
- top_delta="15"
- value="Edit"
- width="40" />
- </panel>
+ </panel>
<text
- type="string"
follows="left|top"
- font="SansSerifBold"
- height="15"
- halign="right"
- layout="topleft"
- left="10"
- name="online_me_status_text"
- text_color="white"
- top_pad="20"
- width="100">
- Status:
- </text>
- <combo_box
- font="SansSerifBold"
- height="18"
- layout="topleft"
- left_pad="0"
- top_delta="0"
- name="status_combo"
- width="100">
- <combo_box.item
- label="Online"
- name="online"
- value="online" />
- <combo_box.item
- label="Away"
- name="away"
- value="away" />
- <combo_box.item
- label="Busy"
- name="busy"
- value="busy" />
- </combo_box>
- <text
- follows="left|top"
- font="SansSerifBold"
- halign="right"
+ font="SansSerifSmall"
+ font.style="BOLD"
height="15"
layout="topleft"
left="10"
name="title_groups_text"
text_color="white"
- top_pad="20"
+ top_pad="15"
value="Groups:"
- width="100" />
+ width="255" />
<text
follows="left|top|right|bottom"
height="160"
layout="topleft"
- left_pad="10"
+ left="10"
name="sl_groups"
- top_delta="0"
+ top_pad="5"
width="130"
word_wrap="true">
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.
@@ -430,7 +368,7 @@
left="0"
name="edit_profile_btn"
top="0"
- width="105" />
+ width="130" />
<button
follows="bottom|left"
font="SansSerifSmallBold"