diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index a6ad24c..0a882eb 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -35,6 +35,7 @@ using System.Threading; | |||
35 | using log4net; | 35 | using log4net; |
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Serialization; | ||
38 | using OpenSim.Region.CoreModules.World.Terrain; | 39 | using OpenSim.Region.CoreModules.World.Terrain; |
39 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
40 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
@@ -126,6 +127,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
126 | if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4) | 127 | if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4) |
127 | assetUuids[regionSettings.TerrainTexture4] = 1; | 128 | assetUuids[regionSettings.TerrainTexture4] = 1; |
128 | 129 | ||
130 | TarArchiveWriter archiveWriter = new TarArchiveWriter(m_saveStream); | ||
131 | |||
129 | // Asynchronously request all the assets required to perform this archive operation | 132 | // Asynchronously request all the assets required to perform this archive operation |
130 | ArchiveWriteRequestExecution awre | 133 | ArchiveWriteRequestExecution awre |
131 | = new ArchiveWriteRequestExecution( | 134 | = new ArchiveWriteRequestExecution( |
@@ -133,10 +136,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
133 | m_scene.RequestModuleInterface<ITerrainModule>(), | 136 | m_scene.RequestModuleInterface<ITerrainModule>(), |
134 | m_scene.RequestModuleInterface<IRegionSerialiserModule>(), | 137 | m_scene.RequestModuleInterface<IRegionSerialiserModule>(), |
135 | m_scene, | 138 | m_scene, |
136 | m_saveStream, | 139 | archiveWriter, |
137 | m_requestId); | 140 | m_requestId); |
138 | 141 | ||
139 | new AssetsRequest(assetUuids.Keys, m_scene.CommsManager.AssetCache, awre.ReceivedAllAssets).Execute(); | 142 | new AssetsRequest( |
143 | new AssetsArchiver(archiveWriter), assetUuids.Keys, | ||
144 | m_scene.CommsManager.AssetCache, awre.ReceivedAllAssets).Execute(); | ||
140 | } | 145 | } |
141 | } | 146 | } |
142 | } | 147 | } |