CHUI-735 : Fixed! Move the delete key handling from the llfolderview to the llinventorypanel level.

3 files changed, 8 insertions, 26 deletions

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index c756ff84e1..dca14cc48f 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -1336,29 +1336,6 @@ BOOL LLFolderView::handleUnicodeCharHere(llwchar uni_char)
 }
 
 
-BOOL LLFolderView::canDoDelete() const
-{
-	if (mSelectedItems.size() == 0) return FALSE;
-
-	for (selected_items_t::const_iterator item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
-	{
-		if (!(*item_it)->getViewModelItem()->isItemRemovable())
-		{
-			return FALSE;
-		}
-	}
-	return TRUE;
-}
-
-void LLFolderView::doDelete()
-{
-	if(mSelectedItems.size() > 0)
-	{				
-		removeSelectedItems();
-	}
-}
-
-
 BOOL LLFolderView::handleMouseDown( S32 x, S32 y, MASK mask )
 {
 	mKeyboardSelection = FALSE;
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index 05b2abb9d3..11fccdace4 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -180,9 +180,6 @@ public:
 	virtual BOOL	canPaste() const;
 	virtual void	paste();
 
-	virtual BOOL	canDoDelete() const;
-	virtual void	doDelete();
-
 	LLFolderViewItem* getNextUnselectedItem();
 
 	// Public rename functionality - can only start the process
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 019ba8f5b2..0653a097f5 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1365,6 +1365,14 @@ BOOL LLInventoryPanel::handleKeyHere( KEY key, MASK mask )
 			LLInventoryAction::doToSelected(mInventory, mFolderRoot, "open");
 			handled = TRUE;
 		}
+		break;
+	case KEY_DELETE:
+		if (mask == MASK_NONE)
+		{
+			LLInventoryAction::doToSelected(mInventory, mFolderRoot, "delete");
+			handled = TRUE;
+		}
+		break;
 	}
 	return handled;
 }