* Remove all use of asset.InvType, as outlined in mailing list discussion

* This is stage 1, the field will be removed from AssetType and the assets table if this change doesn't prove problematic

1 files changed, 27 insertions, 26 deletions

diff --git a/OpenSim/Framework/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs
index 61e8636..e3f078b 100644
--- a/OpenSim/Framework/AgentInventory.cs
+++ b/OpenSim/Framework/AgentInventory.cs
@@ -157,31 +157,32 @@ namespace OpenSim.Framework
             return true;
         }
 
-        public LLUUID AddToInventory(LLUUID folderID, AssetBase asset)
-        {
-            if (InventoryFolders.ContainsKey(folderID))
-            {
-                LLUUID NewItemID = LLUUID.Random();
-
-                InventoryItem Item = new InventoryItem();
-                Item.FolderID = folderID;
-                Item.OwnerID = AgentID;
-                Item.AssetID = asset.FullID;
-                Item.ItemID = NewItemID;
-                Item.Type = asset.Type;
-                Item.Name = asset.Name;
-                Item.Description = asset.Description;
-                Item.InvType = asset.InvType;
-                InventoryItems.Add(Item.ItemID, Item);
-                InventoryFolder Folder = InventoryFolders[Item.FolderID];
-                Folder.Items.Add(Item);
-                return (Item.ItemID);
-            }
-            else
-            {
-                return (null);
-            }
-        }
+        // FIXME: Unused, pending possible cleanup for this whole class.
+//        public LLUUID AddToInventory(LLUUID folderID, AssetBase asset)
+//        {
+//            if (InventoryFolders.ContainsKey(folderID))
+//            {
+//                LLUUID NewItemID = LLUUID.Random();
+//
+//                InventoryItem Item = new InventoryItem();
+//                Item.FolderID = folderID;
+//                Item.OwnerID = AgentID;
+//                Item.AssetID = asset.FullID;
+//                Item.ItemID = NewItemID;
+//                Item.Type = asset.Type;
+//                Item.Name = asset.Name;
+//                Item.Description = asset.Description;
+//                Item.InvType = asset.InvType;
+//                InventoryItems.Add(Item.ItemID, Item);
+//                InventoryFolder Folder = InventoryFolders[Item.FolderID];
+//                Folder.Items.Add(Item);
+//                return (Item.ItemID);
+//            }
+//            else
+//            {
+//                return (null);
+//            }
+//        }
 
         public bool DeleteFromInventory(LLUUID itemID)
         {
@@ -252,4 +253,4 @@ namespace OpenSim.Framework
             return result;
         }
     }
-}
\ No newline at end of file
+}