diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 8c25411c4fa6ebb02f3e3f23516b4b2295b5da03..8e72b83e348730e0446f37cea71c50f8f2ef548b 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 b11b61c8e5154a6860cb26956d486254c32c6e2e..31f12d10970d86b98f6c997ef6088090febecc96 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 2c420aa1e3d5a3eecd62ed836c35666e57363006..9b83b158b96f67eee827fd30055475f63811ec18 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 b2b8c072d1a49f110df66f02b7b26990b4259f5b..7f0be9c8bceb4d538e506f6d394f0a0e39b62072 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 a52247001d9a21661b43449d9117ec352e3db0bc..e612b9cc8e922f4e0eff4e26bdb5382fee09336a 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