SL-19845 Show delete confirmation for 'delete' key

1 files changed, 1 insertions, 36 deletions

diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index b090434528..54b9294ce1 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -211,15 +211,7 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
     else if ("delete" == action)
     {
-        if (!LLInventoryAction::sDeleteConfirmationDisplayed) // ask for the confirmation at least once per session
-        {
-            LLNotifications::instance().setIgnored("DeleteItems", false);
-            LLInventoryAction::sDeleteConfirmationDisplayed = true;
-        }
-
-        LLSD args;
-        args["QUESTION"] = LLTrans::getString("DeleteItem");
-        LLNotificationsUtil::add("DeleteItems", args, LLSD(), boost::bind(&LLInventoryGalleryContextMenu::onDelete, _1, _2, selected_id));
+        mGallery->deleteSelection();
     }
     else if ("copy" == action)
     {
@@ -318,33 +310,6 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata, const LLU
     }
 }
 
-void LLInventoryGalleryContextMenu::onDelete(const LLSD& notification, const LLSD& response, const LLUUID& selected_id)
-{
-    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-    if (option == 0)
-    {
-        LLInventoryObject* obj = gInventory.getObject(selected_id);
-        if (!obj)
-        {
-            return;
-        }
-        if (obj->getType() == LLAssetType::AT_CATEGORY)
-        {
-            if(get_is_category_removable(&gInventory, selected_id))
-            {
-                gInventory.removeCategory(selected_id);
-            }
-        }
-        else
-        {
-            if(get_is_item_removable(&gInventory, selected_id))
-            {
-                gInventory.removeItem(selected_id);
-            }
-        }
-    }
-}
-
 void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLSD& response)
 {
     S32 option = LLNotificationsUtil::getSelectedOption(notification, response);