diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs | 28 |
2 files changed, 14 insertions, 18 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs index 91de3c6..350f138 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs | |||
@@ -118,9 +118,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
118 | /// <summary> | 118 | /// <summary> |
119 | /// Create the control file for this archive | 119 | /// Create the control file for this archive |
120 | /// </summary> | 120 | /// </summary> |
121 | /// <returns> | 121 | /// <returns></returns> |
122 | /// A <see cref="System.String"/> | ||
123 | /// </returns> | ||
124 | protected string CreateControlFile() | 122 | protected string CreateControlFile() |
125 | { | 123 | { |
126 | StringWriter sw = new StringWriter(); | 124 | StringWriter sw = new StringWriter(); |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs index cc60cff..fd77cd0 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -180,21 +180,19 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
180 | GetSceneObjectAssetUuids(sceneObject, assetUuids); | 180 | GetSceneObjectAssetUuids(sceneObject, assetUuids); |
181 | } | 181 | } |
182 | 182 | ||
183 | if (sceneObjects.Count > 0) | 183 | m_log.DebugFormat( |
184 | { | 184 | "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets", |
185 | m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} scene objects", sceneObjects.Count); | 185 | sceneObjects.Count, assetUuids.Count); |
186 | m_log.DebugFormat("[ARCHIVER]: Requiring save of {0} assets", assetUuids.Count); | 186 | |
187 | 187 | // Asynchronously request all the assets required to perform this archive operation | |
188 | // Asynchronously request all the assets required to perform this archive operation | 188 | ArchiveWriteRequestExecution awre |
189 | ArchiveWriteRequestExecution awre | 189 | = new ArchiveWriteRequestExecution( |
190 | = new ArchiveWriteRequestExecution( | 190 | sceneObjects, |
191 | sceneObjects, | 191 | m_scene.RequestModuleInterface<ITerrainModule>(), |
192 | m_scene.RequestModuleInterface<ITerrainModule>(), | 192 | m_scene.RequestModuleInterface<IRegionSerialiser>(), |
193 | m_scene.RequestModuleInterface<IRegionSerialiser>(), | 193 | m_scene.RegionInfo.RegionName, |
194 | m_scene.RegionInfo.RegionName, | 194 | m_savePath); |
195 | m_savePath); | 195 | new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute(); |
196 | new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute(); | ||
197 | } | ||
198 | } | 196 | } |
199 | } | 197 | } |
200 | } | 198 | } |