3 files changed, 27 insertions, 4 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 342d2bc739..7b0eb8c2d2 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1695,6 +1695,7 @@ void LLPanelObjectInventory::updateInventory()
 	}
 
 	mFolders->requestArrange();
+	//LLEditMenuHandler::gEditMenuHandler = mFolders;
 	mInventoryNeedsUpdate = FALSE;
 }
 
@@ -1940,3 +1941,22 @@ void LLPanelObjectInventory::idle(void* user_data)
 		self->updateInventory();
 	}
 }
+
+void LLPanelObjectInventory::onFocusLost()
+{
+	// inventory no longer handles cut/copy/paste/delete
+	if (LLEditMenuHandler::gEditMenuHandler == mFolders)
+	{
+		LLEditMenuHandler::gEditMenuHandler = NULL;
+	}
+	
+	LLPanel::onFocusLost();
+}
+
+void LLPanelObjectInventory::onFocusReceived()
+{
+	// inventory now handles cut/copy/paste/delete
+	LLEditMenuHandler::gEditMenuHandler = mFolders;
+	
+	LLPanel::onFocusReceived();
+}
+\ No newline at end of file
diff --git a/indra/newview/llpanelobjectinventory.h b/indra/newview/llpanelobjectinventory.h
index 6722bb212e..bc339ece35 100644
--- a/indra/newview/llpanelobjectinventory.h
+++ b/indra/newview/llpanelobjectinventory.h
@@ -74,6 +74,9 @@ public:
 	virtual void deleteAllChildren();
 	virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);
 	
+	/*virtual*/ void onFocusLost();
+	/*virtual*/ void onFocusReceived();
+	
 	static void idle(void* user_data);
 
 protected:
diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml
index 7c9e6f0796..ecd96088e7 100644
--- a/indra/newview/skins/default/xui/en/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/menu_text_editor.xml
@@ -32,10 +32,10 @@
      function="Edit.EnablePaste" />
   </menu_item_call>
   <menu_item_call
- label="Delete"
- layout="topleft"
- name="Delete"
- shortcut="Del">
+   label="Delete"
+   layout="topleft"
+   name="Delete"
+   shortcut="Del">
     <menu_item_call.on_click
      function="Edit.Delete" />
     <menu_item_call.on_enable