* UuidGatherer now tracks asset types for assets it discovers. The asset types are inferred from context

* OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
This commit is contained in:
John Hurliman
2010-03-15 14:17:17 -07:00
parent 5beb08be31
commit 33f5d0d1e9
7 changed files with 47 additions and 33 deletions

View File

@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
/// <value>
/// Used to collect the uuids of the assets that we need to save into the archive
/// </value>
protected Dictionary<UUID, int> m_assetUuids = new Dictionary<UUID, int>();
protected Dictionary<UUID, AssetType> m_assetUuids = new Dictionary<UUID, AssetType>();
/// <value>
/// Used to collect the uuids of the users that we need to save into the archive
@@ -305,7 +305,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
}
new AssetsRequest(
new AssetsArchiver(m_archiveWriter), m_assetUuids.Keys,
new AssetsArchiver(m_archiveWriter), m_assetUuids,
m_scene.AssetService, ReceivedAllAssets).Execute();
}