From 1abcc2bfe79f48d7613ed227f97e873b6b4611e6 Mon Sep 17 00:00:00 2001
From: XenHat <commits@xenh.at>
Date: Fri, 16 Jul 2021 14:48:41 -0400
Subject: [PATCH] Enable "Edit..." action by default to bypass slow sim
response. Fix #25
---
indra/newview/llviewermenu.cpp | 2 +-
indra/newview/skins/default/xui/en/menu_attachment_self.xml | 2 +-
.../newview/skins/default/xui/en/menu_inspect_object_gear.xml | 3 ++-
indra/newview/skins/default/xui/en/menu_land.xml | 2 +-
indra/newview/skins/default/xui/en/menu_object.xml | 3 ++-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 8c25411c4fa..8e72b83e348 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3063,7 +3063,7 @@ bool enable_object_edit()
// there. Eventually this needs to be replaced with code that only
// lets you edit objects if you have permission to do so (edit perms,
// group edit, god). See also lltoolbar.cpp. JC
- bool enable = false;
+ bool enable = true;
if (gAgent.inPrelude())
{
enable = LLViewerParcelMgr::getInstance()->allowAgentBuild()
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index b11b61c8e51..31f12d10970 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -3,7 +3,7 @@
layout="topleft"
name="Attachment Pie">
<menu_item_call
- enabled="false"
+ enabled="true"
label="Edit item"
layout="topleft"
name="Edit...">
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
index 2c420aa1e3d..9b83b158b96 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
@@ -73,7 +73,8 @@
<menu_item_call
label="Edit"
layout="topleft"
- name="edit">
+ name="edit"
+ enabled="true">
<menu_item_call.on_click
function="Object.Edit" />
<menu_item_call.on_enable
diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml
index b2b8c072d1a..7f0be9c8bce 100644
--- a/indra/newview/skins/default/xui/en/menu_land.xml
+++ b/indra/newview/skins/default/xui/en/menu_land.xml
@@ -58,7 +58,7 @@
function="EnableEdit" />
</menu_item_call>
<menu_item_call
- enabled="false"
+ enabled="true"
label="Edit Terrain"
name="Edit Terrain">
<menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index a52247001d9..e612b9cc8e9 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -15,7 +15,8 @@
</menu_item_call>
<menu_item_call
label="Edit"
- name="Edit...">
+ name="Edit..."
+ enabled="true">
<menu_item_call.on_click
function="Object.Edit" />
<menu_item_call.on_enable
--
GitLab