summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/menu_name_field.xml22
-rw-r--r--indra/newview/skins/default/xui/en/menu_profile_other.xml129
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile_secondlife.xml57
3 files changed, 151 insertions, 57 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_name_field.xml b/indra/newview/skins/default/xui/en/menu_name_field.xml
deleted file mode 100644
index 3c5e5dd353..0000000000
--- a/indra/newview/skins/default/xui/en/menu_name_field.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- name="CopyMenu">
- <menu_item_call
- label="Copy Display Name"
- layout="topleft"
- name="copy_display">
- <on_click function="Profile.CopyName" parameter="display"/>
- </menu_item_call>
- <menu_item_call
- label="Copy Agent Name"
- layout="topleft"
- name="copy_name">
- <on_click function="Profile.CopyName" parameter="name"/>
- </menu_item_call>
- <menu_item_call
- label="Copy Agent Id"
- layout="topleft"
- name="copy_id">
- <on_click function="Profile.CopyName" parameter="id"/>
- </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_profile_other.xml b/indra/newview/skins/default/xui/en/menu_profile_other.xml
new file mode 100644
index 0000000000..5fc625b8e5
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_profile_other.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Avatar Profile Menu">
+ <menu_item_call
+ label="IM"
+ layout="topleft"
+ name="im">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="im"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Offer Teleport"
+ name="offer_teleport">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="offer_teleport"/>
+ <menu_item_call.on_enable
+ function="Profile.EnableItem"
+ parameter="offer_teleport"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Request Teleport"
+ name="request_teleport">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="request_teleport"/>
+ <menu_item_call.on_enable
+ function="Profile.EnableItem"
+ parameter="request_teleport"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Voice call"
+ layout="topleft"
+ name="voice_call">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="voice_call"/>
+ <menu_item_call.on_enable
+ function="Profile.EnableItem"
+ parameter="voice_call"/>
+ </menu_item_call>
+ <menu_item_separator />
+ <menu_item_call
+ label="View chat history..."
+ layout="topleft"
+ name="chat_history">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="chat_history"/>
+ <menu_item_call.on_enable
+ function="Profile.EnableItem"
+ parameter="chat_history"/>
+ </menu_item_call>
+ <menu_item_separator name="separator_chat_history"/>
+ <menu_item_call
+ label="Add Friend"
+ layout="topleft"
+ name="add_friend">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="add_friend"/>
+ <menu_item_call.on_visible
+ function="Profile.EnableItem"
+ parameter="add_friend"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Remove Friend"
+ layout="topleft"
+ name="remove_friend">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="remove_friend"/>
+ <menu_item_call.on_enable
+ function="Profile.EnableItem"
+ parameter="remove_friend"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Invite to group..."
+ layout="topleft"
+ name="invite_to_group">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="invite_to_group"/>
+ </menu_item_call>
+ <menu_item_separator name="separator_invite_to_group"/>
+ <menu_item_call
+ label="Map"
+ layout="topleft"
+ name="map">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="can_show_on_map"/>
+ <menu_item_call.on_enable
+ function="Profile.EnableItem"
+ parameter="can_show_on_map"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Share"
+ layout="topleft"
+ name="share">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="share"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Pay"
+ layout="topleft"
+ name="pay">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="pay"/>
+ </menu_item_call>
+ <menu_item_check
+ label="Block/Unblock"
+ layout="topleft"
+ name="block_unblock">
+ <menu_item_check.on_click
+ function="Profile.Commit"
+ parameter="toggle_block_agent"/>
+ <menu_item_check.on_check
+ function="Profile.CheckItem"
+ parameter="toggle_block_agent"/>
+ <menu_item_check.on_enable
+ function="Profile.EnableItem"
+ parameter="toggle_block_agent"/>
+ </menu_item_check>
+</toggleable_menu>
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 fe1244aaf3..4b40db9b5d 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -14,7 +14,10 @@
value="[AGE]" />
<string
name="no_partner_text"
- value="None" />
+ value="Partner: None" />
+ <string
+ name="partner_text"
+ value="Partner: [LINK]" />
<string
name="CaptionTextAcctInfo">
Account: [ACCTTYPE]
@@ -78,6 +81,7 @@ Account: [ACCTTYPE]
<text
name="display_name"
value="(loading...)"
+ font="SansSerifBigLarge"
top="0"
left="2"
right="-1"
@@ -88,40 +92,43 @@ Account: [ACCTTYPE]
<text
name="user_name"
value="(loading...)"
- top_pad="3"
+ top_pad="0"
left="2"
right="-1"
- height="20"
+ height="16"
follows="left|top|right"
layout="topleft"/>
<text
name="user_age"
value="(loading...)"
- top_pad="3"
+ top_pad="0"
left="2"
right="-1"
- height="20"
+ height="16"
follows="left|top|right"
layout="topleft"/>
<text
+ type="string"
name="partner_link"
value="Partner: (loading...)"
- top_pad="3"
+ top_pad="0"
left="2"
right="-1"
- height="20"
+ height="16"
follows="left|top|right"
- layout="topleft"/>
+ layout="topleft"
+ translate="false"
+ use_ellipses="true" />
<text
name="account_info"
value="Account: (loading...)"
- top_pad="3"
+ top_pad="0"
left="2"
right="-1"
- height="20"
+ height="16"
follows="left|top|right"
layout="topleft"/>
@@ -139,7 +146,7 @@ Account: [ACCTTYPE]
image_pressed="DropDown_Press"
image_pressed_selected="DropDown_Press"
image_disabled="DropDown_Disabled"
- name="agent_actions" />
+ name="agent_actions_menu" />
</layout_panel>
<layout_panel
@@ -149,6 +156,7 @@ Account: [ACCTTYPE]
width="26"
auto_resize="false"
user_resize="false">
+ <!--Todo: progress indicator-->
<!--Probably should be borderless buttons-->
<icon
name="allow_to_see_online"
@@ -272,7 +280,7 @@ Account: [ACCTTYPE]
user_resize="false">
<text
name="group_label"
- value="(loading...) is a member of:"
+ value="Group membership"
top="1"
left="1"
right="-1"
@@ -300,8 +308,7 @@ Account: [ACCTTYPE]
width="200"
auto_resize="true"
user_resize="false">
- <!-- notes are only for other agents -->
-
+ <!-- notes are only for other agents -->
<text
name="notes_label"
value="My private notes:"
@@ -328,27 +335,7 @@ Account: [ACCTTYPE]
h_pad="2"
max_length="65000"
parse_urls="true"
- word_wrap="true"/>
- <button
- name="save_notes_changes"
- label="Save"
- bottom="-1"
- right="-105"
- height="20"
- width="80"
- follows="bottom|right"
- layout="topleft"
- label_selected="Find on Map"/>
- <button
- name="discard_notes_changes"
- label="Discard"
- bottom="-1"
- right="-1"
- height="20"
- width="100"
- follows="bottom|right"
- layout="topleft"
- label_selected="Find on Map"/>
+ word_wrap="true"/>
</layout_panel>
<layout_panel