* 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

2 files changed, 0 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
index 4f4a3c3..8b4708c 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
@@ -96,7 +96,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                     xtw.WriteElementString("name", asset.Name);
                     xtw.WriteElementString("description", asset.Description);
                     xtw.WriteElementString("asset-type", asset.Type.ToString());
-                    xtw.WriteElementString("inventory-type", asset.InvType.ToString());
                     
                     xtw.WriteEndElement();
                 }
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
index 98364d3..527d544 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
@@ -109,7 +109,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 metadata.Name = reader.ReadElementString("name");
                 metadata.Description = reader.ReadElementString("description");
                 metadata.AssetType = Convert.ToSByte(reader.ReadElementString("asset-type"));
-                metadata.AssetType = Convert.ToSByte(reader.ReadElementString("inventory-type"));
                 
                 m_metadata[filename] = metadata;
                 
@@ -161,7 +160,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 AssetBase asset = new AssetBase(new LLUUID(filename), metadata.Name);
                 asset.Description = metadata.Description;
                 asset.Type = metadata.AssetType;
-                asset.InvType = metadata.InventoryType;
                 asset.Data = data;
 
                 m_cache.AddAsset(asset);
@@ -182,7 +180,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             public string Name;
             public string Description;
             public sbyte AssetType;
-            public sbyte InventoryType;
         }
     }
 }