aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs3
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
96 xtw.WriteElementString("name", asset.Name); 96 xtw.WriteElementString("name", asset.Name);
97 xtw.WriteElementString("description", asset.Description); 97 xtw.WriteElementString("description", asset.Description);
98 xtw.WriteElementString("asset-type", asset.Type.ToString()); 98 xtw.WriteElementString("asset-type", asset.Type.ToString());
99 xtw.WriteElementString("inventory-type", asset.InvType.ToString());
100 99
101 xtw.WriteEndElement(); 100 xtw.WriteEndElement();
102 } 101 }
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
109 metadata.Name = reader.ReadElementString("name"); 109 metadata.Name = reader.ReadElementString("name");
110 metadata.Description = reader.ReadElementString("description"); 110 metadata.Description = reader.ReadElementString("description");
111 metadata.AssetType = Convert.ToSByte(reader.ReadElementString("asset-type")); 111 metadata.AssetType = Convert.ToSByte(reader.ReadElementString("asset-type"));
112 metadata.AssetType = Convert.ToSByte(reader.ReadElementString("inventory-type"));
113 112
114 m_metadata[filename] = metadata; 113 m_metadata[filename] = metadata;
115 114
@@ -161,7 +160,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
161 AssetBase asset = new AssetBase(new LLUUID(filename), metadata.Name); 160 AssetBase asset = new AssetBase(new LLUUID(filename), metadata.Name);
162 asset.Description = metadata.Description; 161 asset.Description = metadata.Description;
163 asset.Type = metadata.AssetType; 162 asset.Type = metadata.AssetType;
164 asset.InvType = metadata.InventoryType;
165 asset.Data = data; 163 asset.Data = data;
166 164
167 m_cache.AddAsset(asset); 165 m_cache.AddAsset(asset);
@@ -182,7 +180,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
182 public string Name; 180 public string Name;
183 public string Description; 181 public string Description;
184 public sbyte AssetType; 182 public sbyte AssetType;
185 public sbyte InventoryType;
186 } 183 }
187 } 184 }
188} 185}