Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2012-04-27 09:26:14 -0700
committer: Diva Canto 2012-04-27 09:26:14 -0700
commit: 2970a18e54bc4811af67a2f0c307fb79c00c9a18 (patch)
tree: e4faab8dd2b55edff0632faf241c960ad553ccbc /OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
parent: Minor change in error message (HG teleport failures) (diff)
parent: Add regression test for teleporting an agent between separated regions on the... (diff)
download: opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.zip
opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.gz
opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.bz2
opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.xz
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 e05e8f6..053c6f5 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
            SerialiserModule serialiserModule = new SerialiserModule();
            TerrainModule terrainModule = new TerrainModule();
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
            SceneHelpers.SetupSceneModules(m_scene, m_archiverModule, serialiserModule, terrainModule);
        }
        
@@ -463,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                SerialiserModule serialiserModule = new SerialiserModule();
                TerrainModule terrainModule = new TerrainModule();
-                TestScene scene2 = SceneHelpers.SetupScene();
+                TestScene scene2 = new SceneHelpers().SetupScene();
                SceneHelpers.SetupSceneModules(scene2, archiverModule, serialiserModule, terrainModule);
                // Make sure there's a valid owner for the owner we saved (this should have been wiped if the code is
@@ -607,7 +607,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                SerialiserModule serialiserModule = new SerialiserModule();
                TerrainModule terrainModule = new TerrainModule();
-                Scene scene = SceneHelpers.SetupScene();
+                Scene scene = new SceneHelpers().SetupScene();
                SceneHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
                m_scene.AddNewSceneObject(new SceneObjectGroup(part2), false);
author	Diva Canto	2012-04-27 09:26:14 -0700
committer	Diva Canto	2012-04-27 09:26:14 -0700
commit	2970a18e54bc4811af67a2f0c307fb79c00c9a18 (patch)
tree	e4faab8dd2b55edff0632faf241c960ad553ccbc /OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
parent	Minor change in error message (HG teleport failures) (diff)
parent	Add regression test for teleporting an agent between separated regions on the... (diff)
download	opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.zip opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.gz opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.bz2 opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.xz

diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index e05e8f6..053c6f5 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
68	SerialiserModule serialiserModule = new SerialiserModule();	68	SerialiserModule serialiserModule = new SerialiserModule();
69	TerrainModule terrainModule = new TerrainModule();	69	TerrainModule terrainModule = new TerrainModule();
70		70
71	m_scene = SceneHelpers.SetupScene();	71	m_scene = new SceneHelpers().SetupScene();
72	SceneHelpers.SetupSceneModules(m_scene, m_archiverModule, serialiserModule, terrainModule);	72	SceneHelpers.SetupSceneModules(m_scene, m_archiverModule, serialiserModule, terrainModule);
73	}	73	}
74		74
@@ -463,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
463	SerialiserModule serialiserModule = new SerialiserModule();	463	SerialiserModule serialiserModule = new SerialiserModule();
464	TerrainModule terrainModule = new TerrainModule();	464	TerrainModule terrainModule = new TerrainModule();
465		465
466	TestScene scene2 = SceneHelpers.SetupScene();	466	TestScene scene2 = new SceneHelpers().SetupScene();
467	SceneHelpers.SetupSceneModules(scene2, archiverModule, serialiserModule, terrainModule);	467	SceneHelpers.SetupSceneModules(scene2, archiverModule, serialiserModule, terrainModule);
468		468
469	// Make sure there's a valid owner for the owner we saved (this should have been wiped if the code is	469	// Make sure there's a valid owner for the owner we saved (this should have been wiped if the code is
@@ -607,7 +607,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
607	SerialiserModule serialiserModule = new SerialiserModule();	607	SerialiserModule serialiserModule = new SerialiserModule();
608	TerrainModule terrainModule = new TerrainModule();	608	TerrainModule terrainModule = new TerrainModule();
609		609
610	Scene scene = SceneHelpers.SetupScene();	610	Scene scene = new SceneHelpers().SetupScene();
611	SceneHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);	611	SceneHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
612		612
613	m_scene.AddNewSceneObject(new SceneObjectGroup(part2), false);	613	m_scene.AddNewSceneObject(new SceneObjectGroup(part2), false);