From 3dc9e6e4c67ad169a9efc52b288ecd4f67f8de71 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Thu, 12 Oct 2023 21:22:28 +0200
Subject: [PATCH] Add inventory context menu back that some UI/UX nodesigner
 removed

---
 indra/newview/llinventorybridge.cpp | 31 +++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 7436146005..8dedb17c05 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4688,6 +4688,14 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
 		}
 
 		disabled_items.push_back(std::string("New Folder"));
+		// <FS:Ansariel> Undo weird menu design
+		disabled_items.push_back(std::string("New Script"));
+		disabled_items.push_back(std::string("New Note"));
+		disabled_items.push_back(std::string("New Settings"));
+		disabled_items.push_back(std::string("New Gesture"));
+		disabled_items.push_back(std::string("New Clothes"));
+		disabled_items.push_back(std::string("New Body Parts"));
+		// <FS:Ansariel>
 		disabled_items.push_back(std::string("upload_def"));
 	}
 	if (favorites == mUUID)
@@ -4710,6 +4718,13 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
     if (getPreferredType() == LLFolderType::FT_MARKETPLACE_STOCK)
     {
         disabled_items.push_back(std::string("New Folder"));
+		// <FS:Ansariel> Undo weird menu design
+		disabled_items.push_back(std::string("New Script"));
+		disabled_items.push_back(std::string("New Note"));
+		disabled_items.push_back(std::string("New Gesture"));
+		disabled_items.push_back(std::string("New Clothes"));
+		disabled_items.push_back(std::string("New Body Parts"));
+		// <FS:Ansariel>
 		disabled_items.push_back(std::string("upload_def"));
     }
     if (marketplace_listings_id == mUUID)
@@ -4778,7 +4793,23 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
                 if (!isMarketplaceListingsFolder() && !model->isObjectDescendentOf(mUUID, outfits_id))
                 // </FS:Ansariel>
                 {
+                    // <FS:Ansariel> Undo weird menu design
+                    items.push_back(std::string("New Script"));
+                    items.push_back(std::string("New Note"));
+                    items.push_back(std::string("New Gesture"));
+                    items.push_back(std::string("New Clothes"));
+                    items.push_back(std::string("New Body Parts"));
+                    items.push_back(std::string("New Settings"));
+                    // </FS:Ansariel>
                     items.push_back(std::string("upload_def"));
+
+                    // <FS:Ansariel> Undo weird menu design
+                    if (!LLEnvironment::instance().isInventoryEnabled())
+                    {
+                        disabled_items.push_back("New Settings");
+                    }
+                    // </FS:Ansariel>
+
                 }
 			}
 			getClipboardEntries(false, items, disabled_items, flags);