* 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

4 files changed, 29 insertions, 31 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
+}
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 29d996b..5435a43 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -106,4 +106,4 @@ namespace OpenSim.Framework
             set { _temporary = value; }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs
index de3028b..004e472 100644
--- a/OpenSim/Framework/AssetLandmark.cs
+++ b/OpenSim/Framework/AssetLandmark.cs
@@ -42,7 +42,6 @@ namespace OpenSim.Framework
             Data = a.Data;
             FullID = a.FullID;
             Type = a.Type;
-            InvType = a.InvType;
             Name = a.Name;
             Description = a.Description;
             InternData();
@@ -58,4 +57,4 @@ namespace OpenSim.Framework
             ulong.TryParse(parts[3].Substring(14, parts[3].Length - 14), out RegionHandle);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 7adcb4a..ba23d82 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -137,13 +137,11 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
                         string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString());
                         string name = source.Configs[i].GetString("name", String.Empty);
                         sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
-                        sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0);
                         string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", String.Empty));
 
                         AssetBase newAsset = CreateAsset(assetIdStr, name, assetPath, false);
 
                         newAsset.Type = type;
-                        newAsset.InvType = invType;
                         assets.Add(newAsset);
                     }
                 }