livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://hg.lindenlab.com/james/gooey

master
Erica 2010-01-05 19:14:28 -08:00
parent 3892cdd32c d2aabf2b1f
commit fd899d4ed6
5 changed files with 211 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/skins/default/xui/en/panel_me.xml
View File

@ -26,7 +26,7 @@
</text> -->
<tab_container
follows="all"
height="575"
height="570"
halign="center"
layout="topleft"
left="10"

229
indra/newview/skins/default/xui/en/panel_my_profile.xml
View File

@ -31,32 +31,49 @@
name="RegisterDateFormat">
[REG_DATE] ([AGE])
</string>
<scroll_container
color="DkGray2"
<layout_stack
name="layout"
orientation="vertical"
follows="all"
height="485"
layout="topleft"
name="profile_scroll"
reserve_scroll_corner="false"
opaque="true"
left="0"
top="0"
width="313">
height="535"
width="313"
border_size="0">
<panel
name="scroll_content_panel"
follows="left|top|right"
height="485"
name="profile_stack"
follows="all"
layout="topleft"
top="0"
left="0"
width="297">
<panel
follows="left|top"
height="505"
width="313">
<scroll_container
color="DkGray2"
follows="all"
layout="topleft"
left="0"
name="profile_scroll"
opaque="true"
height="505"
width="313"
top="0">
<panel
layout="topleft"
follows="left|top|right"
name="scroll_content_panel"
top="0"
left="0"
width="303">
<panel
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"
@ -80,7 +97,7 @@
width="102" />
<text
follows="left|top|right"
font.style="BOLD"
font.style="BOLD"
height="15"
layout="topleft"
left_pad="10"
@ -88,7 +105,7 @@
text_color="white"
top_delta="0"
value="[SECOND_LIFE]:"
width="165" />
width="180" />
<expandable_text
follows="left|top|right"
height="95"
@ -97,20 +114,20 @@
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"
top_pad="10"
left="10"
name="first_life_image_panel"
width="280">
width="300">
<texture_picker
allow_no_texture="true"
default_image_name="None"
@ -133,7 +150,7 @@
width="102" />
<text
follows="left|top|right"
font.style="BOLD"
font.style="BOLD"
height="15"
layout="topleft"
left_pad="10"
@ -141,7 +158,7 @@
text_color="white"
top_delta="0"
value="Real World:"
width="165" />
width="180" />
<expandable_text
follows="left|top|right"
height="95"
@ -150,90 +167,23 @@
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>
<!-- <panel
name="lifes_images_panel"
follows="left|top|right"
height="244"
layout="topleft"
top="0"
left="0"
width="285">
<panel
follows="left|top"
height="117"
layout="topleft"
left="10"
name="second_life_image_panel"
top="0"
width="285">
<text
follows="left|top|right"
font.style="BOLD"
height="15"
layout="topleft"
left="0"
name="second_life_photo_title_text"
text_color="white"
value="[SECOND_LIFE]:"
width="170" />
<texture_picker
allow_no_texture="true"
default_image_name="None"
enabled="false"
follows="top|left"
height="117"
layout="topleft"
left="0"
name="2nd_life_pic"
top_pad="0"
width="102" />
</panel>
<icon
height="18"
image_name="AddItem_Off"
layout="topleft"
name="2nd_life_edit_icon"
label=""
left="87"
tool_tip="Click to select an image"
top="25"
width="18" />
</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
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"
/>
@ -246,8 +196,8 @@
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"
@ -255,7 +205,7 @@
left="10"
name="register_date"
value="05/31/2376"
width="280"
width="300"
word_wrap="true" />
<text
follows="left|top"
@ -265,9 +215,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"
@ -279,16 +229,18 @@
top_delta="0"
value="Go to Dashboard"
width="100"/> -->
<text
<text
follows="left|top"
height="20"
height="28"
layout="topleft"
left="10"
name="acc_status_text"
top_pad="0"
value="Resident. No payment info on file."
width="280"
word_wrap="true" />
width="300"
word_wrap="true">
Resident. No payment info on file.
Linden.
</text>
<text
follows="left|top"
font.style="BOLD"
@ -297,9 +249,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"
@ -307,7 +259,7 @@
left="10"
name="partner_data_panel"
top_pad="0"
width="280">
width="300">
<text
follows="left|top"
height="10"
@ -316,44 +268,43 @@
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="113"
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="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>
</panel>
</scroll_container>
<panel
</panel>
<!-- <panel
follows="bottom|left"
layout="topleft"
left="0"
name="profile_buttons_panel"
top_pad="2"
bottom="10"
height="23"
width="303">
<button
height="28"
width="313">
<button
follows="bottom|left"
height="23"
label="Add Friend"
@ -361,8 +312,9 @@
left="0"
mouse_opaque="false"
name="add_friend"
tool_tip="Offer friendship to the resident"
top="5"
width="75" />
width="80" />
<button
follows="bottom|left"
height="23"
@ -370,7 +322,7 @@
layout="topleft"
name="im"
top="5"
left_pad="5"
left_pad="3"
width="45" />
<button
follows="bottom|left"
@ -378,7 +330,7 @@
label="Call"
layout="topleft"
name="call"
left_pad="5"
left_pad="3"
top="5"
width="45" />
<button
@ -389,7 +341,7 @@
layout="topleft"
name="show_on_map_btn"
top="5"
left_pad="5"
left_pad="3"
width="45" />
<button
follows="bottom|left"
@ -397,23 +349,24 @@
label="Teleport"
layout="topleft"
name="teleport"
left_pad="5"
left_pad="3"
top="5"
width="80" />
</panel>
width="85" />
</panel>-->
<panel
follows="bottom|left"
layout="topleft"
left="0"
top_pad="-17"
top_pad="0"
name="profile_me_buttons_panel"
visible="false"
height="23"
width="303">
height="28"
width="313">
<button
follows="bottom|right"
height="23"
left="10"
left="20"
top="0"
label="Edit Profile"
name="edit_profile_btn"
tool_tip="Edit your personal information"
@ -425,7 +378,7 @@
left_pad="10"
name="edit_appearance_btn"
tool_tip="Create/edit your appearance: physical data, clothes and etc."
right="-10"
width="130" />
</panel>
</layout_stack>
</panel>

20
indra/newview/skins/default/xui/en/panel_notes.xml
View File

@ -115,14 +115,14 @@
<button
follows="bottom|left"
height="23"
label="Add"
label="Add Friend"
layout="topleft"
left="0"
mouse_opaque="false"
name="add_friend"
tool_tip="Offer friendship to the resident"
top="5"
width="55" />
width="80" />
<button
follows="bottom|left"
height="23"
@ -131,8 +131,8 @@
name="im"
tool_tip="Open instant message session"
top="5"
left_pad="5"
width="40" />
left_pad="3"
width="45" />
<button
follows="bottom|left"
height="23"
@ -140,9 +140,9 @@
layout="topleft"
name="call"
tool_tip="Call this resident"
left_pad="5"
left_pad="3"
top="5"
width="55" />
width="45" />
<button
enabled="false"
follows="bottom|left"
@ -152,8 +152,8 @@
name="show_on_map_btn"
tool_tip="Show the resident on the map"
top="5"
left_pad="5"
width="50" />
left_pad="3"
width="45" />
<button
follows="bottom|left"
height="23"
@ -161,9 +161,9 @@
layout="topleft"
name="teleport"
tool_tip="Offer teleport"
left_pad="5"
left_pad="3"
top="5"
width="90" />
width="80" />
</panel>
</layout_stack>
</panel>

204
indra/newview/skins/default/xui/en/panel_profile.xml
View File

@ -27,42 +27,59 @@
<string
name="no_partner_text"
value="None" />
<string
<string
name="RegisterDateFormat">
[REG_DATE] ([AGE])
</string>
<scroll_container
color="DkGray2"
<layout_stack
name="layout"
orientation="vertical"
follows="all"
height="485"
layout="topleft"
name="profile_scroll"
reserve_scroll_corner="true"
opaque="true"
left="0"
top="0"
width="313">
height="535"
width="313"
border_size="0">
<panel
name="scroll_content_panel"
follows="left|top|right"
height="485"
name="profile_stack"
follows="all"
layout="topleft"
top="0"
left="0"
height="505"
width="313">
<scroll_container
color="DkGray2"
follows="all"
layout="topleft"
left="0"
name="profile_scroll"
opaque="true"
height="505"
width="313"
top="0">
<panel
layout="topleft"
follows="left|top|right"
name="profile_scroll_panel"
top="0"
left="0"
width="303">
<panel
follows="left|top"
follows="left|top|right"
height="117"
layout="topleft"
left="10"
name="second_life_image_panel"
top="0"
width="280">
width="303">
<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 +95,7 @@
text_color="white"
top_delta="0"
value="[SECOND_LIFE]:"
width="165" />
width="180" />
<expandable_text
follows="left|top|right"
height="95"
@ -87,26 +104,26 @@
textbox.max_length="512"
name="sl_description_edit"
top_pad="-3"
width="173"
width="185"
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="303">
<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 +138,7 @@
text_color="white"
top_delta="0"
value="Real World:"
width="165" />
width="180" />
<expandable_text
follows="left|top|right"
height="95"
@ -130,57 +147,45 @@
textbox.max_length="512"
name="fl_description_edit"
top_pad="-3"
width="173"
width="185"
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"
<text
follows="left|top"
font="SansSerifSmall"
height="15"
font.style="BOLD"
height="15"
layout="topleft"
left="10"
name="me_homepage_text"
text_color="white"
top_pad="0"
width="280">
Homepage:
</text>
<text
follows="left|top"
height="15"
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 +195,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"
@ -206,14 +211,16 @@
width="100"/> -->
<text
follows="left|top"
height="20"
height="28"
layout="topleft"
left="10"
name="acc_status_text"
top_pad="0"
value="Resident. No payment info on file."
width="280"
word_wrap="true" />
width="300"
word_wrap="true">
Resident. No payment info on file.
Linden.
</text>
<text
follows="left|top"
font.style="BOLD"
@ -222,9 +229,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 +239,7 @@
left="10"
name="partner_data_panel"
top_pad="0"
width="280">
width="300">
<text
follows="left|top"
height="10"
@ -241,43 +248,41 @@
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="113"
layout="topleft"
left="10"
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.
left="7"
name="sl_groups"
top_pad="0"
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>
</panel>
</scroll_container>
</panel>
<panel
follows="bottom|left"
layout="topleft"
left="0"
name="profile_buttons_panel"
top_pad="2"
bottom="0"
height="19"
width="303">
follows="bottom|left"
height="28"
layout="topleft"
name="profile_buttons_panel"
width="313">
<button
follows="bottom|left"
height="23"
@ -288,7 +293,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 +302,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 +311,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 +323,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 +332,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,23 +344,25 @@
tool_tip="Pay money to or share inventory with the resident"
right="-1"
top="5"
width="21" />
</panel>
left_pad="3"
width="23" />-->
</panel>
<panel
follows="bottom|left"
layout="topleft"
left="0"
top_pad="-17"
name="profile_me_buttons_panel"
visible="false"
height="19"
width="303">
follows="bottom|left"
height="28"
layout="topleft"
top_pad="-26"
name="profile_me_buttons_panel"
visible="false"
width="313">
<button
follows="bottom|right"
height="23"
left="10"
left="20"
top="0"
label="Edit Profile"
name="edit_profile_btn"
tool_tip="Edit your personal information"
width="130" />
<button
follows="bottom|right"
@ -363,7 +370,8 @@
label="Edit Appearance"
left_pad="10"
name="edit_appearance_btn"
right="-10"
tool_tip="Create/edit your appearance: physical data, clothes and etc."
width="130" />
</panel>
</panel>
</panel>
</layout_stack>
</panel>

6
indra/newview/skins/default/xui/en/panel_profile_view.xml
View File

@ -26,8 +26,8 @@
top="2"
width="23" />
<text_editor
allow_scroll="false"
bg_visible="false"
allow_scroll="false"
bg_visible="false"
read_only = "true"
follows="top|left|right"
font="SansSerifHugeBold"
@ -55,7 +55,7 @@
halign="center"
layout="topleft"
left="10"
min_width="333"
min_width="333"
name="tabs"
tab_min_width="80"
tab_height="30"