summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanelprofile.cpp5
-rw-r--r--indra/newview/skins/default/xui/en/menu_profile_other.xml8
-rw-r--r--indra/newview/skins/default/xui/en/menu_profile_self.xml8
3 files changed, 21 insertions, 0 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 0f0af37485..b184668290 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -1386,6 +1386,11 @@ void LLPanelProfileSecondLife::onCommitMenu(const LLSD& userdata)
LLWString wstr = utf8str_to_wstring(getAvatarId().asString());
LLClipboard::instance().copyToClipboard(wstr, 0, wstr.size());
}
+ else if (item_name == "copy_profile_link")
+ {
+ LLWString wstr = utf8str_to_wstring(llformat("secondlife:///app/agent/%s/about", getAvatarId().asString().c_str()));
+ LLClipboard::instance().copyToClipboard(wstr, 0, wstr.size());
+ }
else if (item_name == "agent_permissions")
{
onShowAgentPermissionsDialog();
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 101ae33778..a505b38087 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_other.xml
@@ -168,4 +168,12 @@
function="Profile.Commit"
parameter="copy_user_id"/>
</menu_item_call>
+ <menu_item_call
+ label="Copy Profile Link"
+ layout="topleft"
+ name="copy_link">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="copy_profile_link"/>
+ </menu_item_call>
</toggleable_menu>
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 1b21c7ae61..0a03d7ac2b 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_self.xml
@@ -82,4 +82,12 @@
function="Profile.Commit"
parameter="copy_user_id"/>
</menu_item_call>
+ <menu_item_call
+ label="Copy Profile Link"
+ layout="topleft"
+ name="copy_link">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="copy_profile_link"/>
+ </menu_item_call>
</toggleable_menu>