From 5deb0352955c9d8c3caf2ffb3a3aaf53f617c8ef Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Fri, 19 Jul 2024 17:21:26 +0800
Subject: CTRL-SHIFT-X to get the "Shared Enviroment"

https://megapahit.com/show_bug.cgi?id=46
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f3d44cf647..f09fc39596 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"
-- 
cgit v1.2.3


From cc1421d80d64d3802ebf0842355613251121f0be Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Fri, 19 Jul 2024 18:54:48 +0800
Subject: Copy profile link to clipboard in profile actions

https://megapahit.com/show_bug.cgi?id=47
---
 indra/newview/llpanelprofile.cpp                          | 5 +++++
 indra/newview/skins/default/xui/en/menu_profile_other.xml | 8 ++++++++
 indra/newview/skins/default/xui/en/menu_profile_self.xml  | 8 ++++++++
 3 files changed, 21 insertions(+)

(limited to 'indra/newview')

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>
-- 
cgit v1.2.3


From 0d08445a5b1ec0b7f43789d337d59bcf7742736f Mon Sep 17 00:00:00 2001
From: secretfoxtail <remmy@megapahit.net>
Date: Fri, 19 Jul 2024 15:12:05 -0600
Subject: toolbars.xml: replace "places" with "build"

Landmarks button already exists in navigation bar.
---
 indra/newview/app_settings/toolbars.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

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"/>
-- 
cgit v1.2.3