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/Asset/FlotsamAssetCache.cs | |
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 '')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 967c0a1..37cdaae 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -642,7 +642,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
642 | { | 642 | { |
643 | UuidGatherer gatherer = new UuidGatherer(m_AssetService); | 643 | UuidGatherer gatherer = new UuidGatherer(m_AssetService); |
644 | 644 | ||
645 | Dictionary<UUID, int> assets = new Dictionary<UUID, int>(); | 645 | Dictionary<UUID, AssetType> assets = new Dictionary<UUID, AssetType>(); |
646 | foreach (Scene s in m_Scenes) | 646 | foreach (Scene s in m_Scenes) |
647 | { | 647 | { |
648 | StampRegionStatusFile(s.RegionInfo.RegionID); | 648 | StampRegionStatusFile(s.RegionInfo.RegionID); |