diff options
author | Dr Scofield | 2009-04-22 18:09:55 +0000 |
---|---|---|
committer | Dr Scofield | 2009-04-22 18:09:55 +0000 |
commit | 7dbcf0570f0f5d521373df6d381c2d75dc2845d3 (patch) | |
tree | 63d7b2429f78b4b66e9194c5ee35476ac9b1e5e0 /OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |
parent | more cleanup (diff) | |
download | opensim-SC_OLD-7dbcf0570f0f5d521373df6d381c2d75dc2845d3.zip opensim-SC_OLD-7dbcf0570f0f5d521373df6d381c2d75dc2845d3.tar.gz opensim-SC_OLD-7dbcf0570f0f5d521373df6d381c2d75dc2845d3.tar.bz2 opensim-SC_OLD-7dbcf0570f0f5d521373df6d381c2d75dc2845d3.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 15 |
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 | |||
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 | ||