diff options
author | Justin Clark-Casey (justincc) | 2012-09-07 23:30:54 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-14 20:25:44 +0100 |
commit | d7e6fe488d5258ec92230b6c652969f2d0420376 (patch) | |
tree | 2541ddb0752c20f372baffa2a9c6b72fee954a81 /OpenSim/Region/CoreModules/World/Archiver/Tests | |
parent | Support multi-region OAR files (diff) | |
download | opensim-SC_OLD-d7e6fe488d5258ec92230b6c652969f2d0420376.zip opensim-SC_OLD-d7e6fe488d5258ec92230b6c652969f2d0420376.tar.gz opensim-SC_OLD-d7e6fe488d5258ec92230b6c652969f2d0420376.tar.bz2 opensim-SC_OLD-d7e6fe488d5258ec92230b6c652969f2d0420376.tar.xz |
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
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/Tests')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index cfdfd8c..abbaf41 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
311 | 311 | ||
312 | tar.WriteFile( | 312 | tar.WriteFile( |
313 | ArchiveConstants.CONTROL_FILE_PATH, | 313 | ArchiveConstants.CONTROL_FILE_PATH, |
314 | new ArchiveWriteRequestPreparation(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup())); | 314 | new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup())); |
315 | 315 | ||
316 | SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, ownerId, "obj1-", 0x11); | 316 | SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, ownerId, "obj1-", 0x11); |
317 | SceneObjectPart sop2 | 317 | SceneObjectPart sop2 |
@@ -369,7 +369,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
369 | 369 | ||
370 | tar.WriteFile( | 370 | tar.WriteFile( |
371 | ArchiveConstants.CONTROL_FILE_PATH, | 371 | ArchiveConstants.CONTROL_FILE_PATH, |
372 | new ArchiveWriteRequestPreparation(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup())); | 372 | new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup())); |
373 | SceneObjectPart part1 = CreateSceneObjectPart1(); | 373 | SceneObjectPart part1 = CreateSceneObjectPart1(); |
374 | 374 | ||
375 | part1.SitTargetOrientation = new Quaternion(0.2f, 0.3f, 0.4f, 0.5f); | 375 | part1.SitTargetOrientation = new Quaternion(0.2f, 0.3f, 0.4f, 0.5f); |
@@ -559,7 +559,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
559 | tar.WriteDir(ArchiveConstants.TERRAINS_PATH); | 559 | tar.WriteDir(ArchiveConstants.TERRAINS_PATH); |
560 | tar.WriteFile( | 560 | tar.WriteFile( |
561 | ArchiveConstants.CONTROL_FILE_PATH, | 561 | ArchiveConstants.CONTROL_FILE_PATH, |
562 | new ArchiveWriteRequestPreparation(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup())); | 562 | new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup())); |
563 | 563 | ||
564 | RegionSettings rs = new RegionSettings(); | 564 | RegionSettings rs = new RegionSettings(); |
565 | rs.AgentLimit = 17; | 565 | rs.AgentLimit = 17; |