summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/panel_my_profile.xml23
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml128
2 files changed, 70 insertions, 81 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
index d8726a07e2..ffc568281e 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -43,14 +43,14 @@
width="313">
<panel
name="scroll_content_panel"
- follows="left|top|right"
+ follows="all"
height="500"
layout="topleft"
top="0"
left="0"
- width="297">
- <panel
- follows="left|top"
+ width="313">
+ <panel
+ follows="left|top|right"
height="117"
layout="topleft"
left="10"
@@ -80,7 +80,7 @@
width="102" />
<text
follows="left|top|right"
- font.style="BOLD"
+ font.style="BOLD"
height="15"
layout="topleft"
left_pad="10"
@@ -104,10 +104,10 @@
</expandable_text>
</panel>
<panel
- follows="left|top"
+ follows="left|top|right"
height="117"
layout="topleft"
- top_pad="10"
+ top_pad="10"
left="10"
name="first_life_image_panel"
width="300">
@@ -133,7 +133,7 @@
width="102" />
<text
follows="left|top|right"
- font.style="BOLD"
+ font.style="BOLD"
height="15"
layout="topleft"
left_pad="10"
@@ -264,7 +264,7 @@
value="Groups:"
width="300" />
<expandable_text
- follows="left|top|bottom"
+ follows="all"
height="115"
layout="topleft"
left="7"
@@ -285,7 +285,7 @@
top_pad="2"
height="23"
width="303">
- <button
+ <button
follows="bottom|left"
height="23"
label="Add Friend"
@@ -293,6 +293,7 @@
left="0"
mouse_opaque="false"
name="add_friend"
+ tool_tip="Offer friendship to the resident"
top="5"
width="80" />
<button
@@ -337,7 +338,7 @@
follows="bottom|left"
layout="topleft"
left="0"
- top_pad="-2"
+ top_pad="-22"
name="profile_me_buttons_panel"
visible="false"
height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 342cf4144f..bf592535f5 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -27,42 +27,42 @@
<string
name="no_partner_text"
value="None" />
- <string
+ <string
name="RegisterDateFormat">
[REG_DATE] ([AGE])
</string>
<scroll_container
color="DkGray2"
follows="all"
- height="485"
+ height="500"
layout="topleft"
name="profile_scroll"
- reserve_scroll_corner="true"
+ reserve_scroll_corner="false"
opaque="true"
top="0"
width="313">
<panel
name="scroll_content_panel"
- follows="left|top|right"
- height="485"
+ follows="all"
+ height="500"
layout="topleft"
top="0"
left="0"
width="313">
<panel
- follows="left|top"
+ follows="left|top|right"
height="117"
layout="topleft"
left="10"
name="second_life_image_panel"
top="0"
- width="280">
+ width="300">
<texture_picker
allow_no_texture="true"
default_image_name="None"
enabled="false"
follows="top|left"
- height="102"
+ height="117"
layout="topleft"
left="0"
name="2nd_life_pic"
@@ -78,7 +78,7 @@
text_color="white"
top_delta="0"
value="[SECOND_LIFE]:"
- width="165" />
+ width="180" />
<expandable_text
follows="left|top|right"
height="95"
@@ -87,26 +87,26 @@
textbox.max_length="512"
name="sl_description_edit"
top_pad="-3"
- width="173"
+ width="188"
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"
+ follows="left|top|right"
height="117"
layout="topleft"
top_pad="10"
left="10"
name="first_life_image_panel"
- width="280">
+ width="300">
<texture_picker
allow_no_texture="true"
default_image_name="None"
enabled="false"
follows="top|left"
- height="102"
+ height="117"
layout="topleft"
left="0"
name="real_world_pic"
@@ -121,7 +121,7 @@
text_color="white"
top_delta="0"
value="Real World:"
- width="165" />
+ width="180" />
<expandable_text
follows="left|top|right"
height="95"
@@ -130,57 +130,45 @@
textbox.max_length="512"
name="fl_description_edit"
top_pad="-3"
- width="173"
+ width="188"
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
- 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="0"
- width="280">
- Homepage:
- </text>
- <text
+ <text
follows="left|top"
height="15"
+ font.style="BOLD"
+ font="SansSerifMedium"
layout="topleft"
left="10"
name="homepage_edit"
top_pad="0"
value="http://librarianavengers.org"
- width="280"
+ width="300"
word_wrap="false"
use_ellipses="true"
/>
<text
follows="left|top"
- font.style="BOLD"
+ font.style="BOLD"
height="10"
layout="topleft"
left="10"
name="title_member_text"
text_color="white"
top_pad="10"
- value="Member Since:"
- width="280" />
+ value="Resident Since:"
+ width="300" />
<text
follows="left|top"
height="15"
layout="topleft"
left="10"
name="register_date"
- value="05/31/1976"
- width="280"
+ value="05/31/2376"
+ width="300"
word_wrap="true" />
<text
follows="left|top"
@@ -190,9 +178,9 @@
left="10"
name="title_acc_status_text"
text_color="white"
- top_pad="10"
+ top_pad="5"
value="Account Status:"
- width="280" />
+ width="300" />
<!-- <text
type="string"
follows="left|top"
@@ -212,7 +200,7 @@
name="acc_status_text"
top_pad="0"
value="Resident. No payment info on file."
- width="280"
+ width="300"
word_wrap="true" />
<text
follows="left|top"
@@ -222,9 +210,9 @@
left="10"
name="title_partner_text"
text_color="white"
- top_pad="5"
+ top_pad="3"
value="Partner:"
- width="280" />
+ width="300" />
<panel
follows="left|top"
height="15"
@@ -232,7 +220,7 @@
left="10"
name="partner_data_panel"
top_pad="0"
- width="280">
+ width="300">
<text
follows="left|top"
height="10"
@@ -241,31 +229,31 @@
name="partner_text"
top="0"
value="[FIRST] [LAST]"
- width="280"
+ width="300"
word_wrap="true" />
</panel>
<text
follows="left|top"
font.style="BOLD"
- height="15"
+ height="13"
layout="topleft"
left="10"
name="title_groups_text"
text_color="white"
- top_pad="8"
+ top_pad="3"
value="Groups:"
- width="280" />
- <expandable_text
- follows="left|top|bottom"
- height="60"
+ width="300" />
+ <expandable_text
+ follows="all"
+ height="115"
layout="topleft"
- left="10"
- name="sl_groups"
+ left="7"
+ name="sl_groups"
top_pad="0"
- width="280"
- 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.
+ width="300"
+ 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>
@@ -275,8 +263,7 @@
left="0"
name="profile_buttons_panel"
top_pad="2"
- bottom="0"
- height="19"
+ height="23"
width="303">
<button
follows="bottom|left"
@@ -288,7 +275,7 @@
name="add_friend"
tool_tip="Offer friendship to the resident"
top="5"
- width="77" />
+ width="80" />
<button
follows="bottom|left"
height="23"
@@ -297,8 +284,8 @@
name="im"
tool_tip="Open instant message session"
top="5"
- left_pad="5"
- width="33" />
+ left_pad="3"
+ width="45" />
<button
follows="bottom|left"
height="23"
@@ -306,9 +293,9 @@
layout="topleft"
name="call"
tool_tip="Call this resident"
- left_pad="5"
+ left_pad="3"
top="5"
- width="40" />
+ width="45" />
<button
enabled="false"
follows="bottom|left"
@@ -318,8 +305,8 @@
name="show_on_map_btn"
tool_tip="Show the resident on the map"
top="5"
- left_pad="5"
- width="44" />
+ left_pad="3"
+ width="45" />
<button
follows="bottom|left"
height="23"
@@ -327,10 +314,10 @@
layout="topleft"
name="teleport"
tool_tip="Offer teleport"
- left_pad="5"
+ left_pad="3"
top="5"
- width="67" />
- <button
+ width="85" />
+ <!-- <button
follows="bottom|right"
height="23"
label="▼"
@@ -339,16 +326,17 @@
tool_tip="Pay money to or share inventory with the resident"
right="-1"
top="5"
- width="21" />
+ left_pad="3"
+ width="23" />-->
</panel>
<panel
follows="bottom|left"
layout="topleft"
left="0"
- top_pad="-17"
+ top_pad="-22"
name="profile_me_buttons_panel"
visible="false"
- height="19"
+ height="23"
width="303">
<button
follows="bottom|right"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 18:53:15 +0000