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/World/Archiver/ArchiveWriteRequestPreparation.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/World/Archiver/ArchiveWriteRequestPreparation.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index b61b341..b25636f 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
100 | /// <exception cref="System.IO.IOException">if there was an io problem with creating the file</exception> | 100 | /// <exception cref="System.IO.IOException">if there was an io problem with creating the file</exception> |
101 | public void ArchiveRegion() | 101 | public void ArchiveRegion() |
102 | { | 102 | { |
103 | Dictionary<UUID, int> assetUuids = new Dictionary<UUID, int>(); | 103 | Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>(); |
104 | 104 | ||
105 | List<EntityBase> entities = m_scene.GetEntities(); | 105 | List<EntityBase> entities = m_scene.GetEntities(); |
106 | List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>(); | 106 | List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>(); |
@@ -142,18 +142,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
142 | 142 | ||
143 | // Make sure that we also request terrain texture assets | 143 | // Make sure that we also request terrain texture assets |
144 | RegionSettings regionSettings = m_scene.RegionInfo.RegionSettings; | 144 | RegionSettings regionSettings = m_scene.RegionInfo.RegionSettings; |
145 | 145 | ||
146 | if (regionSettings.TerrainTexture1 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_1) | 146 | if (regionSettings.TerrainTexture1 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_1) |
147 | assetUuids[regionSettings.TerrainTexture1] = 1; | 147 | assetUuids[regionSettings.TerrainTexture1] = AssetType.Texture; |
148 | 148 | ||
149 | if (regionSettings.TerrainTexture2 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_2) | 149 | if (regionSettings.TerrainTexture2 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_2) |
150 | assetUuids[regionSettings.TerrainTexture2] = 1; | 150 | assetUuids[regionSettings.TerrainTexture2] = AssetType.Texture; |
151 | 151 | ||
152 | if (regionSettings.TerrainTexture3 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_3) | 152 | if (regionSettings.TerrainTexture3 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_3) |
153 | assetUuids[regionSettings.TerrainTexture3] = 1; | 153 | assetUuids[regionSettings.TerrainTexture3] = AssetType.Texture; |
154 | 154 | ||
155 | if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4) | 155 | if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4) |
156 | assetUuids[regionSettings.TerrainTexture4] = 1; | 156 | assetUuids[regionSettings.TerrainTexture4] = AssetType.Texture; |
157 | 157 | ||
158 | TarArchiveWriter archiveWriter = new TarArchiveWriter(m_saveStream); | 158 | TarArchiveWriter archiveWriter = new TarArchiveWriter(m_saveStream); |
159 | 159 | ||
@@ -168,7 +168,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
168 | m_requestId); | 168 | m_requestId); |
169 | 169 | ||
170 | new AssetsRequest( | 170 | new AssetsRequest( |
171 | new AssetsArchiver(archiveWriter), assetUuids.Keys, | 171 | new AssetsArchiver(archiveWriter), assetUuids, |
172 | m_scene.AssetService, awre.ReceivedAllAssets).Execute(); | 172 | m_scene.AssetService, awre.ReceivedAllAssets).Execute(); |
173 | } | 173 | } |
174 | } | 174 | } |