EXT-2456 : Usability: Inventory > Clothing > context menu not intuitive

Context menu now fills in after folder contents are fetched.

--HG--
branch : avatar-pipeline

3 files changed, 74 insertions, 26 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index c8540bdbd2..db079de593 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1363,11 +1363,13 @@ BOOL LLFolderBridge::isItemRemovable()
 	{

 		return FALSE;

 	}

-

+	// Allow protected types to be removed, but issue a warning.

+	/*

 	if(LLFolderType::lookupIsProtectedType(category->getPreferredType()))

 	{

 		return FALSE;

 	}

+	*/

 

 	LLInventoryPanel* panel = dynamic_cast<LLInventoryPanel*>(mInventoryPanel.get());

 	LLFolderViewFolder* folderp = dynamic_cast<LLFolderViewFolder*>(panel ? panel->getRootFolder()->getItemByID(mUUID) : NULL);

@@ -2191,38 +2193,70 @@ BOOL LLFolderBridge::removeItem()
 	{

 		return FALSE;

 	}

-	// move it to the trash

-	LLPreview::hide(mUUID);

-	LLInventoryModel* model = getInventoryModel();

-	if(!model) return FALSE;

+	const LLViewerInventoryCategory *cat = getCategory();

+	

+	LLSD payload;

+	LLSD args;

+	args["FOLDERNAME"] = cat->getName();

 

-	const LLUUID trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH);

+	LLNotification::Params params("ConfirmDeleteProtectedCategory");

+	params.payload(payload).substitutions(args).functor.function(boost::bind(&LLFolderBridge::removeItemResponse, this, _1, _2));

+	//params.functor.function(boost::bind(&LLFolderBridge::removeItemResponse, this, _1, _2));

+	/*

+	LLNotification::Params params("ChangeLindenEstate");

+	params.functor.function(boost::bind(&LLPanelEstateInfo::callbackChangeLindenEstate, this, _1, _2));

+	*/

+	if (LLFolderType::lookupIsProtectedType(cat->getPreferredType()))

+	{

+		LLNotifications::instance().add(params);

+	}

+	else

+	{

+		LLNotifications::instance().forceResponse(params, 0);

+	}

+	return TRUE;

+}

 

-	// Look for any gestures and deactivate them

-	LLInventoryModel::cat_array_t	descendent_categories;

-	LLInventoryModel::item_array_t	descendent_items;

-	gInventory.collectDescendents( mUUID, descendent_categories, descendent_items, FALSE );

+bool LLFolderBridge::removeItemResponse(const LLSD& notification, const LLSD& response)

+{

+	S32 option = LLNotification::getSelectedOption(notification, response);

 

-	S32 i;

-	for (i = 0; i < descendent_items.count(); i++)

+	// if they choose delete, do it.  Otherwise, don't do anything

+	if(option == 0) 

 	{

-		LLInventoryItem* item = descendent_items[i];

-		if (item->getType() == LLAssetType::AT_GESTURE

-			&& LLGestureManager::instance().isGestureActive(item->getUUID()))

+		// move it to the trash

+		LLPreview::hide(mUUID);

+		LLInventoryModel* model = getInventoryModel();

+		if(!model) return FALSE;

+		

+		const LLUUID trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH);

+		

+		// Look for any gestures and deactivate them

+		LLInventoryModel::cat_array_t	descendent_categories;

+		LLInventoryModel::item_array_t	descendent_items;

+		gInventory.collectDescendents( mUUID, descendent_categories, descendent_items, FALSE );

+		

+		S32 i;

+		for (i = 0; i < descendent_items.count(); i++)

 		{

-			LLGestureManager::instance().deactivateGesture(item->getUUID());

+			LLInventoryItem* item = descendent_items[i];

+			if (item->getType() == LLAssetType::AT_GESTURE

+				&& LLGestureManager::instance().isGestureActive(item->getUUID()))

+			{

+				LLGestureManager::instance().deactivateGesture(item->getUUID());

+			}

 		}

+		

+		// go ahead and do the normal remove if no 'last calling

+		// cards' are being removed.

+		LLViewerInventoryCategory* cat = getCategory();

+		if(cat)

+		{

+			LLInvFVBridge::changeCategoryParent(model, cat, trash_id, TRUE);

+		}

+		return TRUE;

 	}

-

-	// go ahead and do the normal remove if no 'last calling

-	// cards' are being removed.

-	LLViewerInventoryCategory* cat = getCategory();

-	if(cat)

-	{

-		LLInvFVBridge::changeCategoryParent(model, cat, trash_id, TRUE);

-	}

-

-	return TRUE;

+	return FALSE;

 }

 

 void LLFolderBridge::pasteFromClipboard()

diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 7534548894..6a284e0550 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -288,6 +288,8 @@ public:
 
 	virtual BOOL renameItem(const std::string& new_name);
 	virtual BOOL removeItem();
+	bool removeItemResponse(const LLSD& notification, const LLSD& response);
+
 	virtual void pasteFromClipboard();
 	virtual void pasteLinkFromClipboard();
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0d1ed6fc64..cdf62340b2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3932,6 +3932,18 @@ Would you like to leave Busy Mode before completing this transaction?
 
   <notification
    icon="alertmodal.tga"
+   name="ConfirmDeleteProtectedCategory"
+   type="alertmodal">
+The folder &apos;[FOLDERNAME]&apos; is a system folder. Deleting system folders can cause instability.  Are you sure you want to delete it?
+    <usetemplate
+     ignoretext="Confirm before I delete a system folder"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="ConfirmEmptyTrash"
    type="alertmodal">
 Are you sure you want to permanently delete the contents of your Trash?