diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-08-23 21:20:45 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-08-23 21:20:45 +0300 |
| commit | 04618144ffd5d456c9365c5153c4357ea74c6797 (patch) | |
| tree | ac9026123938ba2607e483c3bb3caabaaf346c8f /indra | |
| parent | 1b264af38ca835f4dc64e965846a71313d4be781 (diff) | |
MAINT-7665 Remove menu option should delete both links and images
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
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()); } |