* Improve memory usage when writing OARs

* This should make saving large OARs a somewhat better experience
* However, the problem where saving an archive pulls large numbers of assets into the asset cache isn't yet resolved
* This patch also removes lots of archive writing spam that crept in

1 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index b5aa0f3..cc4eadb 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -85,17 +85,17 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             
             m_log.InfoFormat("[ARCHIVER]: Creating archive file.  This may take some time.");
 
-            TarArchiveWriter archive = new TarArchiveWriter();
+            TarArchiveWriter archive = new TarArchiveWriter(m_saveStream);
 
             // Write out control file
-            archive.AddFile(ArchiveConstants.CONTROL_FILE_PATH, Create0p2ControlFile());
+            archive.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, Create0p2ControlFile());
             
             m_log.InfoFormat("[ARCHIVER]: Added control file to archive.");
             
             // Write out region settings
             string settingsPath 
                 = String.Format("{0}{1}.xml", ArchiveConstants.SETTINGS_PATH, m_scene.RegionInfo.RegionName);
-            archive.AddFile(settingsPath, RegionSettingsSerializer.Serialize(m_scene.RegionInfo.RegionSettings));
+            archive.WriteFile(settingsPath, RegionSettingsSerializer.Serialize(m_scene.RegionInfo.RegionSettings));
             
             m_log.InfoFormat("[ARCHIVER]: Added region settings to archive.");
 
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             
             MemoryStream ms = new MemoryStream();
             m_terrainModule.SaveToStream(terrainPath, ms);
-            archive.AddFile(terrainPath, ms.ToArray());
+            archive.WriteFile(terrainPath, ms.ToArray());
             ms.Close();
             
             m_log.InfoFormat("[ARCHIVER]: Added terrain information to archive.");
@@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         Math.Round(position.X), Math.Round(position.Y), Math.Round(position.Z),
                         sceneObject.UUID);
 
-                archive.AddFile(filename, serializedObject);
+                archive.WriteFile(filename, serializedObject);
             }
             
             m_log.InfoFormat("[ARCHIVER]: Added scene objects to archive.");
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             AssetsArchiver assetsArchiver = new AssetsArchiver(assetsFound);
             assetsArchiver.Archive(archive);
 
-            archive.WriteTar(m_saveStream);
+            archive.Close();
 
             m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive for {0}", m_scene.RegionInfo.RegionName);