From a5b8c901ba02f65e6eccd0c868bcc4d7fa85924f Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 22 Apr 2023 19:14:27 -0400
Subject: [PATCH] Fix inventory bugggg
---
indra/newview/llinventorybridge.cpp | 14 +++++++++++++-
indra/newview/llinventorybridge.h | 2 ++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 49900c61ba5..cf43765ad71 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 1a8a029589c..44f4373420e 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,
--
GitLab