aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs15
2 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 01e5ae0..8e6b461 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -96,6 +96,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
96 part1.Name = partName; 96 part1.Name = partName;
97 97
98 object1 = new SceneObjectGroup(part1); 98 object1 = new SceneObjectGroup(part1);
99 scene.AddNewSceneObject(object1, false);
99 } 100 }
100 101
101 UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); 102 UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 3ffabbd..a25b25f 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -201,11 +201,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
201 Quaternion rotationOffset = new Quaternion(60, 70, 80, 90); 201 Quaternion rotationOffset = new Quaternion(60, 70, 80, 90);
202 Vector3 offsetPosition = new Vector3(20, 25, 30); 202 Vector3 offsetPosition = new Vector3(20, 25, 30);
203 203
204 SerialiserModule serialiserModule = new SerialiserModule();
205 ArchiverModule archiverModule = new ArchiverModule();
206
207 Scene scene = SceneSetupHelpers.SetupScene();
208 SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
209
204 SceneObjectPart part1 210 SceneObjectPart part1
205 = new SceneObjectPart( 211 = new SceneObjectPart(
206 UUID.Zero, shape, groupPosition, rotationOffset, offsetPosition); 212 UUID.Zero, shape, groupPosition, rotationOffset, offsetPosition);
207 part1.Name = part1Name; 213 part1.Name = part1Name;
208 SceneObjectGroup object1 = new SceneObjectGroup(part1); 214 SceneObjectGroup object1 = new SceneObjectGroup(part1);
215 scene.AddNewSceneObject(object1, false);
209 216
210 string object1FileName = string.Format( 217 string object1FileName = string.Format(
211 "{0}_{1:000}-{2:000}-{3:000}__{4}.xml", 218 "{0}_{1:000}-{2:000}-{3:000}__{4}.xml",
@@ -218,11 +225,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
218 225
219 MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); 226 MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
220 227
221 SerialiserModule serialiserModule = new SerialiserModule(); 228 // SerialiserModule serialiserModule = new SerialiserModule();
222 ArchiverModule archiverModule = new ArchiverModule(); 229 // ArchiverModule archiverModule = new ArchiverModule();
223 230
224 Scene scene = SceneSetupHelpers.SetupScene(); 231 // Scene scene = SceneSetupHelpers.SetupScene();
225 SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); 232 // SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
226 233
227 archiverModule.DearchiveRegion(archiveReadStream); 234 archiverModule.DearchiveRegion(archiveReadStream);
228 235