OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Allow archiver to operate even if there are 0 scene objects to save

0.6.0-stable
Justin Clarke Casey 2008-07-02 23:07:52 +00:00
parent 3183a20632
commit bc20c88a0a
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
View File

@ -118,9 +118,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
/// <summary> /// <summary>
/// Create the control file for this archive /// Create the control file for this archive
/// </summary> /// </summary>
/// <returns> /// <returns></returns>
/// A <see cref="System.String"/>
/// </returns>
protected string CreateControlFile() protected string CreateControlFile()
{ {
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();

8
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
View File

@ -180,10 +180,9 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
GetSceneObjectAssetUuids(sceneObject, assetUuids); GetSceneObjectAssetUuids(sceneObject, assetUuids);
} }
if (sceneObjects.Count > 0) m_log.DebugFormat(
{ "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets",
m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} scene objects", sceneObjects.Count); sceneObjects.Count, assetUuids.Count);
m_log.DebugFormat("[ARCHIVER]: Requiring save of {0} assets", assetUuids.Count);
// Asynchronously request all the assets required to perform this archive operation // Asynchronously request all the assets required to perform this archive operation
ArchiveWriteRequestExecution awre ArchiveWriteRequestExecution awre
@ -196,5 +195,4 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute(); new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute();
} }
} }
}
} }