Continuing progress on SL-17602 inventory support for Materials. now have working inventory bridge implementations

1 files changed, 63 insertions, 0 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index d23980024d..cd6f631ee1 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1426,6 +1426,14 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type,
             new_listener = new LLSettingsBridge(inventory, root, uuid, LLSettingsType::fromInventoryFlags(flags));
             break;
 
+        case LLAssetType::AT_MATERIAL:
+            if (inv_type != LLInventoryType::IT_MATERIAL)
+            {
+                LL_WARNS() << LLAssetType::lookup(asset_type) << " asset has inventory type " << LLInventoryType::lookupHumanReadable(inv_type) << " on uuid " << uuid << LL_ENDL;
+            }
+            new_listener = new LLMaterialBridge(inventory, root, uuid);
+            break;
+
 		default:
 			LL_INFOS_ONCE() << "Unhandled asset type (llassetstorage.h): "
 					<< (S32)asset_type << " (" << LLAssetType::lookup(asset_type) << ")" << LL_ENDL;
@@ -7215,6 +7223,39 @@ bool LLSettingsBridge::canUpdateRegion() const
 
 
 // +=================================================+
+// |        LLMaterialBridge                         |
+// +=================================================+
+
+void LLMaterialBridge::openItem()
+{
+    LLViewerInventoryItem* item = getItem();
+    if (item)
+    {
+        LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
+    }
+}
+
+void LLMaterialBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
+{
+    LL_DEBUGS() << "LLMaterialBridge::buildContextMenu()" << LL_ENDL;
+
+    if (isMarketplaceListingsFolder())
+    {
+        menuentry_vec_t items;
+        menuentry_vec_t disabled_items;
+        addMarketplaceContextMenuOptions(flags, items, disabled_items);
+        items.push_back(std::string("Properties"));
+        getClipboardEntries(false, items, disabled_items, flags);
+        hide_context_entries(menu, items, disabled_items);
+    }
+    else
+    {
+        LLItemBridge::buildContextMenu(menu, flags);
+    }
+}
+
+
+// +=================================================+
 // |        LLLinkBridge                             |
 // +=================================================+
 // For broken folder links.
@@ -7601,6 +7642,25 @@ protected:
     LLSettingsBridgeAction(const LLUUID& id, LLInventoryModel* model) : LLInvFVBridgeAction(id, model) {}
 };
 
+class LLMaterialBridgeAction : public LLInvFVBridgeAction
+{
+    friend class LLInvFVBridgeAction;
+public:
+    void doIt() override
+    {
+        LLViewerInventoryItem* item = getItem();
+        if (item)
+        {
+            // TODO - show UI for material preview?
+            LL_INFOS() << "inventory action performed on material: " << item->getName() << " " << item->getUUID() << LL_ENDL;
+        }
+        LLInvFVBridgeAction::doIt();
+    }
+    ~LLMaterialBridgeAction() = default;
+private:
+    LLMaterialBridgeAction(const LLUUID& id,LLInventoryModel* model) : LLInvFVBridgeAction(id,model) {}
+};
+
 
 LLInvFVBridgeAction* LLInvFVBridgeAction::createAction(LLAssetType::EType asset_type,
 													   const LLUUID& uuid,
@@ -7643,6 +7703,9 @@ LLInvFVBridgeAction* LLInvFVBridgeAction::createAction(LLAssetType::EType asset_
         case LLAssetType::AT_SETTINGS:
             action = new LLSettingsBridgeAction(uuid, model);
             break;
+        case LLAssetType::AT_MATERIAL:
+            action = new LLMaterialBridgeAction(uuid, model);
+            break;
 		default:
 			break;
 	}