Merge branch 'main' into maint-b

5 files changed, 23 insertions, 1 deletions

diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml
index 2e57a67e7d..cd900b6c60 100644
--- a/indra/newview/app_settings/toolbars.xml
+++ b/indra/newview/app_settings/toolbars.xml
@@ -14,7 +14,7 @@
     button_display_mode="icons_only">
     <command name="search"/>
     <command name="map"/>
-    <command name="places"/>
+    <command name="build"/>
     <command name="minimap"/>
     <command name="snapshot"/>
     <command name="aboutland"/>
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>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ec0d4e1768..39a2331e04 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1023,6 +1023,7 @@
             </menu_item_check>
             <menu_item_check
              label="Use Shared Environment"
+             shortcut="control|shift|X"
              name="Use Shared Environment">
                 <menu_item_check.on_click
                  function="World.EnvSettings"