From 04618144ffd5d456c9365c5153c4357ea74c6797 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 23 Aug 2017 21:20:45 +0300 Subject: MAINT-7665 Remove menu option should delete both links and images --- indra/newview/llappearancemgr.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 12159738d8..e9b2a43f38 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1572,9 +1572,15 @@ void LLAppearanceMgr::removeOutfitPhoto(const LLUUID& outfit_id) LLInventoryModel::EXCLUDE_TRASH); BOOST_FOREACH(LLViewerInventoryItem* outfit_item, outfit_item_array) { - // Note: removing only links LLViewerInventoryItem* linked_item = outfit_item->getLinkedItem(); - if (linked_item != NULL && linked_item->getActualType() == LLAssetType::AT_TEXTURE) + if (linked_item != NULL) + { + if (linked_item->getActualType() == LLAssetType::AT_TEXTURE) + { + gInventory.removeItem(outfit_item->getUUID()); + } + } + else if (outfit_item->getActualType() == LLAssetType::AT_TEXTURE) { gInventory.removeItem(outfit_item->getUUID()); } -- cgit v1.2.3