diff options
author | John Hurliman | 2010-03-15 14:17:17 -0700 |
---|---|---|
committer | John Hurliman | 2010-03-15 14:17:17 -0700 |
commit | 33f5d0d1e90c3e63e06a200043a01c32768335c1 (patch) | |
tree | 8be352ceace25400a51c3a26ca1c2ce654788e55 /OpenSim/Region/CoreModules/Framework | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-33f5d0d1e90c3e63e06a200043a01c32768335c1.zip opensim-SC_OLD-33f5d0d1e90c3e63e06a200043a01c32768335c1.tar.gz opensim-SC_OLD-33f5d0d1e90c3e63e06a200043a01c32768335c1.tar.bz2 opensim-SC_OLD-33f5d0d1e90c3e63e06a200043a01c32768335c1.tar.xz |
* 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
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs index 664f38d..58ce550 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs | |||
@@ -150,7 +150,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
150 | if (asset != null) | 150 | if (asset != null) |
151 | { | 151 | { |
152 | // OK, now fetch the inside. | 152 | // OK, now fetch the inside. |
153 | Dictionary<UUID, int> ids = new Dictionary<UUID, int>(); | 153 | Dictionary<UUID, AssetType> ids = new Dictionary<UUID, AssetType>(); |
154 | HGUuidGatherer uuidGatherer = new HGUuidGatherer(this, m_scene.AssetService, userAssetURL); | 154 | HGUuidGatherer uuidGatherer = new HGUuidGatherer(this, m_scene.AssetService, userAssetURL); |
155 | uuidGatherer.GatherAssetUuids(asset.FullID, (AssetType)asset.Type, ids); | 155 | uuidGatherer.GatherAssetUuids(asset.FullID, (AssetType)asset.Type, ids); |
156 | foreach (UUID uuid in ids.Keys) | 156 | foreach (UUID uuid in ids.Keys) |
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
173 | AssetBase asset = m_scene.AssetService.Get(assetID.ToString()); | 173 | AssetBase asset = m_scene.AssetService.Get(assetID.ToString()); |
174 | if (asset != null) | 174 | if (asset != null) |
175 | { | 175 | { |
176 | Dictionary<UUID, int> ids = new Dictionary<UUID, int>(); | 176 | Dictionary<UUID, AssetType> ids = new Dictionary<UUID, AssetType>(); |
177 | HGUuidGatherer uuidGatherer = new HGUuidGatherer(this, m_scene.AssetService, string.Empty); | 177 | HGUuidGatherer uuidGatherer = new HGUuidGatherer(this, m_scene.AssetService, string.Empty); |
178 | uuidGatherer.GatherAssetUuids(asset.FullID, (AssetType)asset.Type, ids); | 178 | uuidGatherer.GatherAssetUuids(asset.FullID, (AssetType)asset.Type, ids); |
179 | foreach (UUID uuid in ids.Keys) | 179 | foreach (UUID uuid in ids.Keys) |