EXT-2668 : Screwy logic for figuring out if a folder is removable

EXT-2661 : "Remove From Outfit" on COF doesn't take off my outfit
EXT-2662 : Can't delete a worn item link

Cleaned up the whole "isItemRemovable" logic, and having folders figure this out recursively via children.
Changed the isItemRemovable logic so that links aren't treated as worn for the purposes of deletion.

--HG--
branch : avatar-pipeline

4 files changed, 64 insertions, 51 deletions

diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 1096f25f0c..41e3279795 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -2030,6 +2030,22 @@ void LLFolderViewFolder::openItem( void )
 	toggleOpen();
 }
 
+void LLFolderViewFolder::applyFunctorToChildren(LLFolderViewFunctor& functor)
+{
+	for (folders_t::iterator iter = mFolders.begin();
+		iter != mFolders.end();)
+	{
+		folders_t::iterator fit = iter++;
+		functor.doItem((*fit));
+	}
+	for (items_t::iterator iter = mItems.begin();
+		iter != mItems.end();)
+	{
+		items_t::iterator iit = iter++;
+		functor.doItem((*iit));
+	}
+}
+
 void LLFolderViewFolder::applyFunctorRecursively(LLFolderViewFunctor& functor)
 {
 	functor.doFolder(this);
diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h
index 30387812a6..f6264ec968 100644
--- a/indra/newview/llfolderviewitem.h
+++ b/indra/newview/llfolderviewitem.h
@@ -501,6 +501,9 @@ public:
 	void applyFunctorRecursively(LLFolderViewFunctor& functor);
 	virtual void applyListenerFunctorRecursively(LLFolderViewListenerFunctor& functor);
 
+	// Just apply this functor to the folder's immediate children.
+	void applyFunctorToChildren(LLFolderViewFunctor& functor);
+
 	virtual void openItem( void );
 	virtual BOOL addItem(LLFolderViewItem* item);
 	virtual BOOL addFolder( LLFolderViewFolder* folder);
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index bb8b45ef11..578cf7bebc 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -171,16 +171,33 @@ time_t LLInvFVBridge::getCreationDate() const
 	return 0;

 }

 

-// Can be destoryed (or moved to trash)

+// Can be destroyed (or moved to trash)

 BOOL LLInvFVBridge::isItemRemovable()

 {

-	LLInventoryModel* model = getInventoryModel();

-	if(!model) return FALSE;

-	if(model->isObjectDescendentOf(mUUID, gInventory.getRootFolderID()))

+	const LLInventoryModel* model = getInventoryModel();

+	if(!model) 

+	{

+		return FALSE;

+	}

+	if(!model->isObjectDescendentOf(mUUID, gInventory.getRootFolderID()))

+	{

+		return FALSE;

+	}

+	const LLInventoryObject *obj = model->getItem(mUUID);

+	if (obj && obj->getIsLinkType())

 	{

 		return TRUE;

 	}

-	return FALSE;

+	if (gAgentWearables.isWearingItem(mUUID))

+	{

+		return FALSE;

+	}

+	const LLVOAvatarSelf* avatar = gAgent.getAvatarObject();

+	if (avatar && avatar->isWearingAttachment(mUUID))

+	{

+		return FALSE;

+	}

+	return TRUE;

 }

 

 // Can be moved to another folder

@@ -1303,6 +1320,23 @@ void LLFolderBridge::selectItem()
 }

 

 

+// Iterate through a folder's children to determine if

+// all the children are removable.

+class LLIsItemRemovable : public LLFolderViewFunctor

+{

+public:

+	LLIsItemRemovable() : mPassed(TRUE) {}

+	virtual void doFolder(LLFolderViewFolder* folder)

+	{

+		mPassed &= folder->getListener()->isItemRemovable();

+	}

+	virtual void doItem(LLFolderViewItem* item)

+	{

+		mPassed &= item->getListener()->isItemRemovable();

+	}

+	BOOL mPassed;

+};

+

 // Can be destroyed (or moved to trash)

 BOOL LLFolderBridge::isItemRemovable()

 {

@@ -1334,41 +1368,17 @@ BOOL LLFolderBridge::isItemRemovable()
 		return FALSE;

 	}

 

-	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_categories.count(); i++ )

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

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

+	if (folderp)

 	{

-		LLInventoryCategory* category = descendent_categories[i];

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

+		LLIsItemRemovable folder_test;

+		folderp->applyFunctorToChildren(folder_test);

+		if (!folder_test.mPassed)

 		{

 			return FALSE;

 		}

 	}

-

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

-	{

-		LLInventoryItem* item = descendent_items[i];

-		if( (item->getType() == LLAssetType::AT_CLOTHING) ||

-			(item->getType() == LLAssetType::AT_BODYPART) )

-		{

-			if(gAgentWearables.isWearingItem(item->getUUID()))

-			{

-				return FALSE;

-			}

-		}

-		else

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

-		{

-			if(avatar->isWearingAttachment(item->getUUID()))

-			{

-				return FALSE;

-			}

-		}

-	}

-

 	return TRUE;

 }

 

@@ -3772,14 +3782,6 @@ LLItemBridge(inventory, uuid), mInvType(type)
 	mIsMultiObject = ( flags & LLInventoryItem::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS ) ?  TRUE: FALSE;

 }

 

-BOOL LLObjectBridge::isItemRemovable()

-{

-	LLVOAvatarSelf* avatar = gAgent.getAvatarObject();

-	if(!avatar) return FALSE;

-	if(avatar->isWearingAttachment(mUUID)) return FALSE;

-	return LLInvFVBridge::isItemRemovable();

-}

-

 LLUIImagePtr LLObjectBridge::getIcon() const

 {

 	return get_item_icon(LLAssetType::AT_OBJECT, mInvType, mAttachPt, mIsMultiObject );

@@ -4299,12 +4301,6 @@ BOOL LLWearableBridge::renameItem(const std::string& new_name)
 	return LLItemBridge::renameItem(new_name);

 }

 

-BOOL LLWearableBridge::isItemRemovable()

-{

-	if (gAgentWearables.isWearingItem(mUUID)) return FALSE;

-	return LLInvFVBridge::isItemRemovable();

-}

-

 std::string LLWearableBridge::getLabelSuffix() const

 {

 	if( gAgentWearables.isWearingItem( mUUID ) )

diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 49e64ebdde..7534548894 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -508,7 +508,6 @@ public:
 	virtual LLFontGL::StyleFlags getLabelStyle() const;
 	virtual std::string getLabelSuffix() const;
 	virtual void			buildContextMenu(LLMenuGL& menu, U32 flags);
-	virtual BOOL			isItemRemovable();
 	virtual BOOL renameItem(const std::string& new_name);
 
 	LLInventoryObject* getObject() const;
@@ -546,7 +545,6 @@ public:
 	virtual void	openItem();
 	virtual void	buildContextMenu(LLMenuGL& menu, U32 flags);
 	virtual std::string getLabelSuffix() const;
-	virtual BOOL	isItemRemovable();
 	virtual BOOL renameItem(const std::string& new_name);
 
 	static void		onWearOnAvatar( void* userdata );	// Access to wearOnAvatar() from menu