From: Alan Webb <alan_webb@us.ibm.com>

Changes to enable script state persistence across non-restart
serialization situations (inventory/OAR/attachments)

Also fixing test cases for OAR and IAR so they don't barf with the new code.

1 files changed, 11 insertions, 4 deletions

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
             Quaternion rotationOffset = new Quaternion(60, 70, 80, 90);
             Vector3 offsetPosition = new Vector3(20, 25, 30);
 
+            SerialiserModule serialiserModule = new SerialiserModule();
+            ArchiverModule archiverModule = new ArchiverModule();
+
+            Scene scene = SceneSetupHelpers.SetupScene();
+            SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
+
             SceneObjectPart part1
                 = new SceneObjectPart(
                     UUID.Zero, shape, groupPosition, rotationOffset, offsetPosition);
             part1.Name = part1Name;
             SceneObjectGroup object1 = new SceneObjectGroup(part1);
+            scene.AddNewSceneObject(object1, false);
 
             string object1FileName = string.Format(
                 "{0}_{1:000}-{2:000}-{3:000}__{4}.xml",
@@ -218,11 +225,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
 
-            SerialiserModule serialiserModule = new SerialiserModule();
-            ArchiverModule archiverModule = new ArchiverModule();
+            // SerialiserModule serialiserModule = new SerialiserModule();
+            // ArchiverModule archiverModule = new ArchiverModule();
 
-            Scene scene = SceneSetupHelpers.SetupScene();
-            SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
+            // Scene scene = SceneSetupHelpers.SetupScene();
+            // SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
 
             archiverModule.DearchiveRegion(archiveReadStream);