diff --git a/indra/newview/alavataractions.cpp b/indra/newview/alavataractions.cpp
index b835d0ae59a01284b0abd9f3c218cba3c16b5972..a7100bafe1aa5e52622ee181830e0eb5a90792be 100644
--- a/indra/newview/alavataractions.cpp
+++ b/indra/newview/alavataractions.cpp
@@ -103,6 +103,13 @@ void ALAvatarActions::copyData(const uuid_vec_t& ids, ECopyDataType type)
data_string.append(av_name.getDisplayName(true));
break;
}
+ case E_DATA_COMPLETE_NAME:
+ {
+ LLAvatarName av_name;
+ LLAvatarNameCache::get(id, &av_name);
+ data_string.append(av_name.getCompleteName(true, true));
+ break;
+ }
case E_DATA_SLURL:
data_string.append(LLSLURL("agent", id, "about").getSLURLString());
break;
@@ -138,6 +145,10 @@ void ALAvatarActions::copyData(const LLUUID& id, const LLSD& userdata)
{
copyData(id, E_DATA_DISPLAY_NAME);
}
+ else if (item_name == "full_name")
+ {
+ copyData(id, E_DATA_COMPLETE_NAME);
+ }
else if (item_name == "id")
{
copyData(id, E_DATA_UUID);
diff --git a/indra/newview/alavataractions.h b/indra/newview/alavataractions.h
index 6334c626756d17921cbb16e4fcbb960042bb6f9c..b3390a8a6e0c0d88abd9700a14158131d5e59a63 100644
--- a/indra/newview/alavataractions.h
+++ b/indra/newview/alavataractions.h
@@ -51,6 +51,7 @@ class ALAvatarActions
E_DATA_USER_NAME = 0,
E_DATA_ACCOUNT_NAME,
E_DATA_DISPLAY_NAME,
+ E_DATA_COMPLETE_NAME,
E_DATA_SLURL,
E_DATA_UUID
};
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index 7b89d22c98cb2235b9d7e5a3fa6ba087cfbf6aa6..da5e1e8c4bcfda37d21a6eac1db44887fbf973bf 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -210,7 +210,7 @@ void LLConversationItem::buildParticipantMenuOptions(menuentry_vec_t& items, U32
items.push_back(std::string("utils_menu"));
items.push_back(std::string("copy_username"));
items.push_back(std::string("copy_display_name"));
- items.push_back(std::string("copy_account_name"));
+ items.push_back(std::string("copy_full_name"));
items.push_back(std::string("copy_slurl"));
items.push_back(std::string("copy_uuid"));
}
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index a9f7308e32cd90402476b61c54f1672649659565..6d0674f70a977dec699c694f9aceaedd66708e82 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1316,6 +1316,10 @@ void LLFloaterIMContainer::doToParticipants(const std::string& command, uuid_vec
{
ALAvatarActions::copyData(userID, ALAvatarActions::E_DATA_ACCOUNT_NAME);
}
+ else if ("copy_full_name" == command)
+ {
+ ALAvatarActions::copyData(userID, ALAvatarActions::E_DATA_COMPLETE_NAME);
+ }
else if ("copy_slurl" == command)
{
ALAvatarActions::copyData(userID, ALAvatarActions::E_DATA_SLURL);
@@ -1355,6 +1359,10 @@ void LLFloaterIMContainer::doToParticipants(const std::string& command, uuid_vec
{
ALAvatarActions::copyData(selectedIDS, ALAvatarActions::E_DATA_ACCOUNT_NAME);
}
+ else if ("copy_full_name" == command)
+ {
+ ALAvatarActions::copyData(selectedIDS, ALAvatarActions::E_DATA_COMPLETE_NAME);
+ }
else if ("copy_slurl" == command)
{
ALAvatarActions::copyData(selectedIDS, ALAvatarActions::E_DATA_SLURL);
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp
index ec0dadfb986fa4ef86a050f5bd3951a7dcee0922..6e9407ff9b96626d12de462b4827e4c85b61af4b 100644
--- a/indra/newview/llpanelpeoplemenus.cpp
+++ b/indra/newview/llpanelpeoplemenus.cpp
@@ -154,9 +154,9 @@ void PeopleContextMenu::buildContextMenu(class LLMenuGL& menu, U32 flags)
items.push_back(std::string("offer_teleport"));
items.push_back(std::string("separator_utils"));
items.push_back(std::string("utils_menu"));
- items.push_back(std::string("copy_username"));
+ items.push_back(std::string("copy_full_name"));
items.push_back(std::string("copy_display_name"));
- items.push_back(std::string("copy_account_name"));
+ items.push_back(std::string("copy_username"));
items.push_back(std::string("copy_slurl"));
items.push_back(std::string("copy_uuid"));
}
@@ -181,9 +181,9 @@ void PeopleContextMenu::buildContextMenu(class LLMenuGL& menu, U32 flags)
items.push_back(std::string("block_unblock"));
items.push_back(std::string("report_abuse"));
items.push_back(std::string("utils_menu"));
- items.push_back(std::string("copy_username"));
+ items.push_back(std::string("copy_full_name"));
items.push_back(std::string("copy_display_name"));
- items.push_back(std::string("copy_account_name"));
+ items.push_back(std::string("copy_username"));
items.push_back(std::string("copy_slurl"));
items.push_back(std::string("copy_uuid"));
}
@@ -431,9 +431,9 @@ void NearbyPeopleContextMenu::buildContextMenu(class LLMenuGL& menu, U32 flags)
}
}
items.push_back(std::string("utils_menu"));
- items.push_back(std::string("copy_username"));
+ items.push_back(std::string("copy_full_name"));
items.push_back(std::string("copy_display_name"));
- items.push_back(std::string("copy_account_name"));
+ items.push_back(std::string("copy_username"));
items.push_back(std::string("copy_slurl"));
items.push_back(std::string("copy_uuid"));
}
@@ -476,9 +476,9 @@ void NearbyPeopleContextMenu::buildContextMenu(class LLMenuGL& menu, U32 flags)
}
}
items.push_back(std::string("utils_menu"));
- items.push_back(std::string("copy_username"));
+ items.push_back(std::string("copy_full_name"));
items.push_back(std::string("copy_display_name"));
- items.push_back(std::string("copy_account_name"));
+ items.push_back(std::string("copy_username"));
items.push_back(std::string("copy_slurl"));
items.push_back(std::string("copy_uuid"));
}
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index fc7c3ed2c85825e6756aa8bca761310c9e3d84ac..76c62ef95b403dea3d36f2d24b853e04d1c1f64e 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -754,6 +754,9 @@ LLPanelProfileSecondLife::LLPanelProfileSecondLife()
, mWaitingForImageUpload(false)
, mAllowPublish(false)
{
+ mCommitCallbackRegistrar.add("Profile.Commit", [this](LLUICtrl*, const LLSD& userdata) { onCommitMenu(userdata); });
+ mEnableCallbackRegistrar.add("Profile.EnableItem", [this](LLUICtrl*, const LLSD& userdata) { return onEnableMenu(userdata); });
+ mEnableCallbackRegistrar.add("Profile.CheckItem", [this](LLUICtrl*, const LLSD& userdata) { return onCheckMenu(userdata); });
}
LLPanelProfileSecondLife::~LLPanelProfileSecondLife()
@@ -839,14 +842,7 @@ void LLPanelProfileSecondLife::onOpen(const LLSD& key)
mGroupList->enableForAgent(false);
}
- // Init menu, menu needs to be created in scope of a registar to work correctly.
- LLUICtrl::CommitCallbackRegistry::ScopedRegistrar commit;
- commit.add("Profile.Commit", [this](LLUICtrl*, const LLSD& userdata) { onCommitMenu(userdata); });
-
- LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable;
- enable.add("Profile.EnableItem", [this](LLUICtrl*, const LLSD& userdata) { return onEnableMenu(userdata); });
- enable.add("Profile.CheckItem", [this](LLUICtrl*, const LLSD& userdata) { return onCheckMenu(userdata); });
-
+ // Init menu
if (own_profile)
{
mAgentActionMenuButton->setMenu("menu_profile_self.xml", LLMenuButton::MP_BOTTOM_RIGHT);
@@ -866,6 +862,8 @@ void LLPanelProfileSecondLife::onOpen(const LLSD& key)
fillRightsData();
}
+ getChild<LLUICtrl>("user_key")->setValue(avatar_id.asString());
+
mAvatarNameCacheConnection = LLAvatarNameCache::get(getAvatarId(), boost::bind(&LLPanelProfileSecondLife::onAvatarNameCache, this, _1, _2));
}
@@ -1451,7 +1449,8 @@ void LLPanelProfileSecondLife::onCommitMenu(const LLSD& userdata)
onShowAgentPermissionsDialog();
}
else if (item_name == "copy_display_name"
- || item_name == "copy_username")
+ || item_name == "copy_username"
+ || item_name == "copy_full_name")
{
LLAvatarName av_name;
if (!LLAvatarNameCache::get(getAvatarId(), &av_name))
@@ -1469,6 +1468,10 @@ void LLPanelProfileSecondLife::onCommitMenu(const LLSD& userdata)
{
wstr = utf8str_to_wstring(av_name.getUserName());
}
+ else if (item_name == "copy_full_name")
+ {
+ wstr = utf8str_to_wstring(av_name.getCompleteName(true, true));
+ }
LLClipboard::instance().copyToClipboard(wstr, 0, wstr.size());
}
else if (item_name == "edit_display_name")
@@ -1548,7 +1551,8 @@ bool LLPanelProfileSecondLife::onEnableMenu(const LLSD& userdata)
return LLAvatarActions::isFriend(agent_id);
}
else if (item_name == "copy_display_name"
- || item_name == "copy_username")
+ || item_name == "copy_username"
+ || item_name == "copy_full_name")
{
return !mAvatarNameCacheConnection.connected();
}
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 679acc3c9b3aa219f106225e24bb14ceb7bed6ff..f78b8cf6cebbf6d960e5035e9df51c12e828efeb 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -129,31 +129,32 @@
function="Advanced.EnableAppearanceToXML"/>
</menu_item_call>
<menu_item_call
- label="Copy Username"
- name="Copy Username">
+ label="Copy Full Name"
+ name="copy_full_name">
<menu_item_call.on_click
function="Avatar.CopyData"
- parameter="user_name"/>
- <menu_item_call.on_enable
- function="RLV.CanShowName" />
+ parameter="full_name"/>
</menu_item_call>
<menu_item_call
label="Copy Display Name"
- name="Copy Display Name">
+ name="copy_display_name">
<menu_item_call.on_click
function="Avatar.CopyData"
parameter="display_name"/>
- <menu_item_call.on_enable
- function="RLV.CanShowName" />
</menu_item_call>
<menu_item_call
- label="Copy Account Name"
- name="Copy Account Name">
+ label="Copy Agent Name"
+ name="copy_username">
<menu_item_call.on_click
function="Avatar.CopyData"
- parameter="account_name"/>
- <menu_item_call.on_enable
- function="RLV.CanShowName" />
+ parameter="user_name"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Copy SLurl"
+ name="copy_slurl">
+ <menu_item_call.on_click
+ function="Avatar.CopyData"
+ parameter="slurl"/>
</menu_item_call>
<menu_item_call
label="Copy SLurl"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
index 636ba2c033fa70f9d3d7dce912e9257de96861f5..0a028bf89acf5be1c0a3936875db3164871fda7b 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
@@ -167,11 +167,11 @@
label="Actions"
name="Utilities">
<menu_item_call
- label="Copy Username"
- name="Copy Username">
+ label="Copy Full Name"
+ name="Copy Full Name">
<menu_item_call.on_click
function="AvatarIcon.CopyData"
- parameter="user_name"/>
+ parameter="full_name"/>
</menu_item_call>
<menu_item_call
label="Copy Display Name"
@@ -181,11 +181,11 @@
parameter="display_name"/>
</menu_item_call>
<menu_item_call
- label="Copy Account Name"
- name="Copy Account Name">
+ label="Copy Agent Name"
+ name="Copy Username">
<menu_item_call.on_click
function="AvatarIcon.CopyData"
- parameter="account_name"/>
+ parameter="user_name"/>
</menu_item_call>
<menu_item_call
label="Copy SLurl"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 905ae507161d31d5692d603790898243df971222..4f63fa86ef0ba27297093f73e04543304d3d1974 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -131,31 +131,32 @@
function="Advanced.EnableAppearanceToXML"/>
</menu_item_call>
<menu_item_call
- label="Copy Username"
- name="Copy Username">
+ label="Copy Full Name"
+ name="copy_full_name">
<menu_item_call.on_click
function="Avatar.CopyData"
- parameter="user_name"/>
- <menu_item_call.on_enable
- function="RLV.CanShowName" />
+ parameter="full_name"/>
</menu_item_call>
<menu_item_call
label="Copy Display Name"
- name="Copy Display Name">
+ name="copy_display_name">
<menu_item_call.on_click
function="Avatar.CopyData"
parameter="display_name"/>
- <menu_item_call.on_enable
- function="RLV.CanShowName" />
</menu_item_call>
<menu_item_call
- label="Copy Account Name"
- name="Copy Account Name">
+ label="Copy Agent Name"
+ name="copy_username">
<menu_item_call.on_click
function="Avatar.CopyData"
- parameter="account_name"/>
- <menu_item_call.on_enable
- function="RLV.CanShowName" />
+ parameter="user_name"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Copy SLurl"
+ name="copy_slurl">
+ <menu_item_call.on_click
+ function="Avatar.CopyData"
+ parameter="slurl"/>
</menu_item_call>
<menu_item_call
label="Copy SLurl"
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index a3ec370e1a20a2483494449ab192c8a29d14dd37..ce03113c8ff3672655fea188c854eee6cde6c930 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -237,14 +237,14 @@
</menu_item_call>
<menu_item_separator name="separator_utils"/>
<context_menu
- label="Utilities"
+ label="Actions"
name="utils_menu">
<menu_item_call
- label="Copy Username"
- name="copy_username">
+ label="Copy Full Name"
+ name="copy_full_name">
<menu_item_call.on_click
function="Avatar.DoToSelected"
- parameter="copy_username"/>
+ parameter="copy_full_name"/>
</menu_item_call>
<menu_item_call
label="Copy Display Name"
@@ -254,11 +254,11 @@
parameter="copy_display_name"/>
</menu_item_call>
<menu_item_call
- label="Copy Account Name"
- name="copy_account_name">
+ label="Copy Agent Name"
+ name="copy_username">
<menu_item_call.on_click
function="Avatar.DoToSelected"
- parameter="copy_account_name"/>
+ parameter="copy_username"/>
</menu_item_call>
<menu_item_call
label="Copy SLurl"
diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_avatar_profile.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_avatar_profile.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a292a8daea5d1c8959fa674864809332eb0a478e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_avatar_profile.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Copy SecondLife Profile Menu">
+ <menu_item_call
+ label="Copy Full Name"
+ layout="topleft"
+ name="copy_full_name">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="copy_full_name"/>
+ <menu_item_call.on_enable
+ function="Profile.EnableItem"
+ parameter="copy_full_name"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Copy Display Name"
+ layout="topleft"
+ name="copy_display_name">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="copy_display_name"/>
+ <menu_item_call.on_enable
+ function="Profile.EnableItem"
+ parameter="copy_display_name"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Copy Agent Name"
+ layout="topleft"
+ name="copy_name">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="copy_username"/>
+ <menu_item_call.on_enable
+ function="Profile.EnableItem"
+ parameter="copy_username"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Copy SLurl"
+ layout="topleft"
+ name="copy_slurl">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="copy_user_slurl"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Copy UUID"
+ layout="topleft"
+ name="copy_id">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="copy_user_id"/>
+ </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
index 566b841fd94f1de615a00561d316b14ff28d02e1..de34f9ee0addf4ce7f6a3d73654269baf9d3881f 100644
--- a/indra/newview/skins/default/xui/en/menu_im_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
@@ -113,11 +113,11 @@
label="Actions"
name="utils_menu">
<menu_item_call
- label="Copy Username"
- name="copy_username">
+ label="Copy Full Name"
+ name="copy_full_name">
<menu_item_call.on_click
function="Avatar.GearDoToSelected"
- parameter="copy_username"/>
+ parameter="copy_full_name"/>
</menu_item_call>
<menu_item_call
label="Copy Display Name"
@@ -127,11 +127,11 @@
parameter="copy_display_name"/>
</menu_item_call>
<menu_item_call
- label="Copy Account Name"
- name="copy_account_name">
+ label="Copy Agent Name"
+ name="copy_username">
<menu_item_call.on_click
function="Avatar.GearDoToSelected"
- parameter="copy_account_name"/>
+ parameter="copy_username"/>
</menu_item_call>
<menu_item_call
label="Copy SLurl"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index b5be8992137f68b271869a8bd55b6aabde79d77b..cdb78d26cf74b0ebb8dcc27af909b4540f359843 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -216,11 +216,11 @@
label="Actions"
name="utils_menu">
<menu_item_call
- label="Copy Username"
- name="copy_username">
+ label="Copy Full Name"
+ name="copy_full_name">
<menu_item_call.on_click
function="Avatar.CopyData"
- parameter="user_name"/>
+ parameter="full_name"/>
</menu_item_call>
<menu_item_call
label="Copy Display Name"
@@ -230,11 +230,11 @@
parameter="display_name"/>
</menu_item_call>
<menu_item_call
- label="Copy Account Name"
- name="copy_account_name">
+ label="Copy Agent Name"
+ name="copy_username">
<menu_item_call.on_click
function="Avatar.CopyData"
- parameter="account_name"/>
+ parameter="user_name"/>
</menu_item_call>
<menu_item_call
label="Copy SLurl"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
index d57af54da33cf2ec4459ca714156960751a58336..a936163cbb75e737d131d20a2a6fe3c88aa6f848 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
@@ -123,11 +123,11 @@
label="Actions"
name="utils_menu">
<menu_item_call
- label="Copy Username"
- name="copy_username">
+ label="Copy Full Name"
+ name="copy_full_name">
<menu_item_call.on_click
function="Avatar.CopyData"
- parameter="user_name"/>
+ parameter="full_name"/>
</menu_item_call>
<menu_item_call
label="Copy Display Name"
@@ -137,11 +137,11 @@
parameter="display_name"/>
</menu_item_call>
<menu_item_call
- label="Copy Account Name"
- name="copy_account_name">
+ label="Copy Agent Name"
+ name="copy_username">
<menu_item_call.on_click
function="Avatar.CopyData"
- parameter="account_name"/>
+ parameter="user_name"/>
</menu_item_call>
<menu_item_call
label="Copy SLurl"
diff --git a/indra/newview/skins/default/xui/en/menu_profile_other.xml b/indra/newview/skins/default/xui/en/menu_profile_other.xml
index b6c7ed943610d0aa9b232c89113b695a7ecd72f8..20608050b5f635b6d8aea311be90ea56c020b9f5 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_other.xml
@@ -138,6 +138,17 @@
parameter="toggle_block_agent"/>
</menu_item_check>
<menu_item_separator name="separator_copy_options"/>
+ <menu_item_call
+ label="Copy Full Name"
+ layout="topleft"
+ name="copy_full_name">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="copy_full_name"/>
+ <menu_item_call.on_enable
+ function="Profile.EnableItem"
+ parameter="copy_full_name"/>
+ </menu_item_call>
<menu_item_call
label="Copy Display Name"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_profile_self.xml b/indra/newview/skins/default/xui/en/menu_profile_self.xml
index 83ef3ae4833ccc2bbd616dab77e1c449b68029f7..30d7f8ea2cc9ebccdf4b927a783ae5be22bfdcc4 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_self.xml
@@ -52,6 +52,17 @@
parameter="remove_photo"/>
</menu_item_call>
<menu_item_separator name="separator_copy_options"/>
+ <menu_item_call
+ label="Copy Full Name"
+ layout="topleft"
+ name="copy_full_name">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="copy_full_name"/>
+ <menu_item_call.on_enable
+ function="Profile.EnableItem"
+ parameter="copy_full_name"/>
+ </menu_item_call>
<menu_item_call
label="Copy Display Name"
layout="topleft"
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 52f930f135c2eeaefcd95ad44549b2b124afe31c..b2dfe0a9f443a86d4a87f4494fae562251f9859e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -5,7 +5,7 @@
top="0"
left="0"
height="480"
- width="420"
+ width="500"
follows="all"
layout="topleft"
>
@@ -407,7 +407,7 @@ Account: [ACCTTYPE]
name="display_name_panel"
follows="all"
layout="topleft"
- height="24"
+ height="45"
auto_resize="false"
user_resize="false">
<line_editor
@@ -422,7 +422,7 @@ Account: [ACCTTYPE]
top="0"
left="6"
height="19"
- right="-86"
+ right="-79"
follows="left|top|right"
layout="topleft"/>
@@ -435,7 +435,7 @@ Account: [ACCTTYPE]
follows="right|top"
interactable="true"
top="0"
- right="-61"
+ right="-53"
height="24"
width="24"
left_pad="2" />
@@ -449,7 +449,7 @@ Account: [ACCTTYPE]
follows="right|top"
interactable="true"
top="0"
- right="-61"
+ right="-53"
height="24"
width="24"
left_pad="2" />
@@ -463,7 +463,7 @@ Account: [ACCTTYPE]
follows="right|top"
interactable="true"
top="0"
- right="-30"
+ right="-27"
height="24"
width="24"
left_pad="2" />
@@ -477,7 +477,7 @@ Account: [ACCTTYPE]
follows="right|top"
interactable="true"
top="0"
- right="-30"
+ right="-27"
height="24"
width="24"
left_pad="2" />
@@ -510,8 +510,43 @@ Account: [ACCTTYPE]
width="24"
left_pad="2" />
- </layout_panel>
-
+ <text
+ top_pad="4"
+ left="6"
+ height="16"
+ width="25"
+ layout="topleft"
+ follows="left|top"
+ name="Key:"
+ value="Key:"/>
+ <line_editor
+ top_delta="-1"
+ left_pad="0"
+ height="16"
+ layout="topleft"
+ follows="left|top|right"
+ name="user_key"
+ border_thickness="0"
+ use_bg_color="false"
+ background_image_disabled=""
+ background_image_focused=""
+ enabled="false"
+ max_length_bytes="254"
+ value="00000000-0000-0000-0000-000000000000"
+ width="250"/>
+ <menu_button
+ menu_filename="menu_copy_paste_avatar_profile.xml"
+ follows="top|right"
+ height="15"
+ image_disabled="ClipboardMenu_Disabled"
+ image_selected="ClipboardMenu_Press"
+ image_unselected="ClipboardMenu_Off"
+ layout="topleft"
+ left_delta="278"
+ name="clipboard_avatar_params"
+ tool_tip="Paste options"
+ width="22"/>
+ </layout_panel>
<layout_panel
name="about_panel"
follows="all"