From bc20c88a0ab08e1cf7e16cd5dea298ee1edc49b7 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 2 Jul 2008 23:07:52 +0000
Subject: * Allow archiver to operate even if there are 0 scene objects to save

---
 .../World/Archiver/ArchiveWriteRequestExecution.cs |  4 +---
 .../Archiver/ArchiveWriteRequestPreparation.cs     | 28 ++++++++++------------
 2 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'OpenSim')

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
         /// <summary>
         /// Create the control file for this archive
         /// </summary>
-        /// <returns>
-        /// A <see cref="System.String"/>
-        /// </returns>
+        /// <returns></returns>
         protected string CreateControlFile()
         {
             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
                 GetSceneObjectAssetUuids(sceneObject, assetUuids);
             }
 
-            if (sceneObjects.Count > 0)
-            {
-                m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} scene objects", sceneObjects.Count);
-                m_log.DebugFormat("[ARCHIVER]: Requiring save of {0} assets", assetUuids.Count);
-
-                // Asynchronously request all the assets required to perform this archive operation
-                ArchiveWriteRequestExecution awre 
-                    = new ArchiveWriteRequestExecution(
-                        sceneObjects, 
-                        m_scene.RequestModuleInterface<ITerrainModule>(),
-                        m_scene.RequestModuleInterface<IRegionSerialiser>(),
-                        m_scene.RegionInfo.RegionName,
-                        m_savePath);
-                new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute();
-            }
+            m_log.DebugFormat(
+                "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets", 
+                sceneObjects.Count, assetUuids.Count);
+
+            // Asynchronously request all the assets required to perform this archive operation
+            ArchiveWriteRequestExecution awre 
+                = new ArchiveWriteRequestExecution(
+                    sceneObjects, 
+                    m_scene.RequestModuleInterface<ITerrainModule>(),
+                    m_scene.RequestModuleInterface<IRegionSerialiser>(),
+                    m_scene.RegionInfo.RegionName,
+                    m_savePath);
+            new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute();
         }
     }
 }
-- 
cgit v1.1