diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 49900c61ba53f1a1df244f348239cc543bc99964..cf43765ad710bb40ffd75521b8aaa0a285c76ae7 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -871,7 +871,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, // disabled_items.push_back(std::string("Copy")); // } - if (isAgentInventory()) + if (isAgentInventory() && !isCOFFolder() && !isInboxFolder() && !isOutfitsFolder()) { items.push_back(std::string("New folder from selected")); items.push_back(std::string("Subfolder Separator")); @@ -1417,6 +1417,18 @@ BOOL LLInvFVBridge::isMarketplaceListingsFolder() const return gInventory.isObjectDescendentOf(mUUID, folder_id); } +BOOL LLInvFVBridge::isOutfitsFolder() const +{ + const LLUUID inbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false); + + if (inbox_id.isNull()) + { + return FALSE; + } + + return gInventory.isObjectDescendentOf(mUUID, inbox_id); +} + BOOL LLInvFVBridge::isItemPermissive() const { return FALSE; diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 1a8a029589c5b8a85eedfe840f827c799651c6dd..44f4373420ec8f7bd6de6f58050236fe0ad3bbd5 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -177,6 +177,8 @@ class LLInvFVBridge : public LLFolderViewModelItemInventory BOOL isMarketplaceListingsFolder() const; // true if descendant of Marketplace listings folder + BOOL isOutfitsFolder() const; + virtual BOOL isItemPermissive() const; static void changeItemParent(LLInventoryModel* model, LLViewerInventoryItem* item,