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

Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the multi-OAR patch there is now only one class that handles this operation. 

Adapation of 0004-Renamed-ArchiveWriteRequestPreparation-to-ArchiveWri.patch in http://opensimulator.org/mantis/view.php?id=6105
since that did not directly apply
integration
Justin Clark-Casey (justincc) 2012-09-07 23:30:54 +01:00
parent ce468215d5
commit d7e6fe488d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs → OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
/// <summary> /// <summary>
/// Prepare to write out an archive. /// Prepare to write out an archive.
/// </summary> /// </summary>
public class ArchiveWriteRequestPreparation public class ArchiveWriteRequest
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
/// <exception cref="System.IO.IOException"> /// <exception cref="System.IO.IOException">
/// If there was a problem opening a stream for the file specified by the savePath /// If there was a problem opening a stream for the file specified by the savePath
/// </exception> /// </exception>
public ArchiveWriteRequestPreparation(Scene scene, string savePath, Guid requestId) : this(scene, requestId) public ArchiveWriteRequest(Scene scene, string savePath, Guid requestId) : this(scene, requestId)
{ {
try try
{ {
@ -116,12 +116,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
/// <param name="scene">The root scene to archive</param> /// <param name="scene">The root scene to archive</param>
/// <param name="saveStream">The stream to which to save data.</param> /// <param name="saveStream">The stream to which to save data.</param>
/// <param name="requestId">The id associated with this request</param> /// <param name="requestId">The id associated with this request</param>
public ArchiveWriteRequestPreparation(Scene scene, Stream saveStream, Guid requestId) : this(scene, requestId) public ArchiveWriteRequest(Scene scene, Stream saveStream, Guid requestId) : this(scene, requestId)
{ {
m_saveStream = saveStream; m_saveStream = saveStream;
} }
protected ArchiveWriteRequestPreparation(Scene scene, Guid requestId) protected ArchiveWriteRequest(Scene scene, Guid requestId)
{ {
m_rootScene = scene; m_rootScene = scene;
m_requestId = requestId; m_requestId = requestId;

4
OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
View File

@ -170,7 +170,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_log.InfoFormat( m_log.InfoFormat(
"[ARCHIVER]: Writing archive for region {0} to {1}", Scene.RegionInfo.RegionName, savePath); "[ARCHIVER]: Writing archive for region {0} to {1}", Scene.RegionInfo.RegionName, savePath);
new ArchiveWriteRequestPreparation(Scene, savePath, requestId).ArchiveRegion(options); new ArchiveWriteRequest(Scene, savePath, requestId).ArchiveRegion(options);
} }
public void ArchiveRegion(Stream saveStream) public void ArchiveRegion(Stream saveStream)
@ -185,7 +185,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
public void ArchiveRegion(Stream saveStream, Guid requestId, Dictionary<string, object> options) public void ArchiveRegion(Stream saveStream, Guid requestId, Dictionary<string, object> options)
{ {
new ArchiveWriteRequestPreparation(Scene, saveStream, requestId).ArchiveRegion(options); new ArchiveWriteRequest(Scene, saveStream, requestId).ArchiveRegion(options);
} }
public void DearchiveRegion(string loadPath) public void DearchiveRegion(string loadPath)

6
OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
View File

@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
tar.WriteFile( tar.WriteFile(
ArchiveConstants.CONTROL_FILE_PATH, ArchiveConstants.CONTROL_FILE_PATH,
new ArchiveWriteRequestPreparation(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup())); new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup()));
SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, ownerId, "obj1-", 0x11); SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, ownerId, "obj1-", 0x11);
SceneObjectPart sop2 SceneObjectPart sop2
@ -369,7 +369,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
tar.WriteFile( tar.WriteFile(
ArchiveConstants.CONTROL_FILE_PATH, ArchiveConstants.CONTROL_FILE_PATH,
new ArchiveWriteRequestPreparation(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup())); new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup()));
SceneObjectPart part1 = CreateSceneObjectPart1(); SceneObjectPart part1 = CreateSceneObjectPart1();
part1.SitTargetOrientation = new Quaternion(0.2f, 0.3f, 0.4f, 0.5f); part1.SitTargetOrientation = new Quaternion(0.2f, 0.3f, 0.4f, 0.5f);
@ -559,7 +559,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
tar.WriteDir(ArchiveConstants.TERRAINS_PATH); tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
tar.WriteFile( tar.WriteFile(
ArchiveConstants.CONTROL_FILE_PATH, ArchiveConstants.CONTROL_FILE_PATH,
new ArchiveWriteRequestPreparation(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup())); new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup()));
RegionSettings rs = new RegionSettings(); RegionSettings rs = new RegionSettings();
rs.AgentLimit = 17; rs.AgentLimit = 17;