Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
author: Melanie 2012-04-27 17:09:49 +0100
committer: Melanie 2012-04-27 17:09:49 +0100
commit: 90305001de2dc043fa76760367ac22de0056686a (patch)
tree: ad8d39d2064d4a6b07d03b55d6cfd0dbe3d3d8f5 /OpenSim/Region/ScriptEngine/Shared/Tests
parent: Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parent: Add regression test for teleporting an agent between separated regions on the... (diff)
download: opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.zip
opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.tar.gz
opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.tar.bz2
opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.tar.xz
4 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
index e2d0db2..49266e9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
            IConfig config = initConfigSource.AddConfig("XEngine");
            config.Set("Enabled", "true");
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
            SceneHelpers.SetupSceneModules(m_scene, initConfigSource);
            m_engine = new XEngine.XEngine();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index 9cf9258..92a63bf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
            IConfig config = initConfigSource.AddConfig("XEngine");
            config.Set("Enabled", "true");
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
            SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
            XEngine.XEngine engine = new XEngine.XEngine();
@@ -261,7 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
            TestHelpers.InMethod();
            // Create Prim1.
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
            string obj1Name = "Prim1";
            UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
            SceneObjectPart part1 =
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
index 7573dff..c51227b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
            config = initConfigSource.AddConfig("NPC");
            config.Set("Enabled", "true");
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
            SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule());
            m_engine = new XEngine.XEngine();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
index 9d9fc51..9c36108 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
            config = initConfigSource.AddConfig("NPC");
            config.Set("Enabled", "true");
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
            SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule());
            m_engine = new XEngine.XEngine();
author	Melanie	2012-04-27 17:09:49 +0100
committer	Melanie	2012-04-27 17:09:49 +0100
commit	90305001de2dc043fa76760367ac22de0056686a (patch)
tree	ad8d39d2064d4a6b07d03b55d6cfd0dbe3d3d8f5 /OpenSim/Region/ScriptEngine/Shared/Tests
parent	Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parent	Add regression test for teleporting an agent between separated regions on the... (diff)
download	opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.zip opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.tar.gz opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.tar.bz2 opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs index e2d0db2..49266e9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
63	IConfig config = initConfigSource.AddConfig("XEngine");	63	IConfig config = initConfigSource.AddConfig("XEngine");
64	config.Set("Enabled", "true");	64	config.Set("Enabled", "true");
65		65
66	m_scene = SceneHelpers.SetupScene();	66	m_scene = new SceneHelpers().SetupScene();
67	SceneHelpers.SetupSceneModules(m_scene, initConfigSource);	67	SceneHelpers.SetupSceneModules(m_scene, initConfigSource);
68		68
69	m_engine = new XEngine.XEngine();	69	m_engine = new XEngine.XEngine();


diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs index 9cf9258..92a63bf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
58	IConfig config = initConfigSource.AddConfig("XEngine");	58	IConfig config = initConfigSource.AddConfig("XEngine");
59	config.Set("Enabled", "true");	59	config.Set("Enabled", "true");
60		60
61	Scene scene = SceneHelpers.SetupScene();	61	Scene scene = new SceneHelpers().SetupScene();
62	SceneObjectPart part = SceneHelpers.AddSceneObject(scene);	62	SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
63		63
64	XEngine.XEngine engine = new XEngine.XEngine();	64	XEngine.XEngine engine = new XEngine.XEngine();
@@ -261,7 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
261	TestHelpers.InMethod();	261	TestHelpers.InMethod();
262		262
263	// Create Prim1.	263	// Create Prim1.
264	Scene scene = SceneHelpers.SetupScene();	264	Scene scene = new SceneHelpers().SetupScene();
265	string obj1Name = "Prim1";	265	string obj1Name = "Prim1";
266	UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");	266	UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
267	SceneObjectPart part1 =	267	SceneObjectPart part1 =


diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs index 7573dff..c51227b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
67	config = initConfigSource.AddConfig("NPC");	67	config = initConfigSource.AddConfig("NPC");
68	config.Set("Enabled", "true");	68	config.Set("Enabled", "true");
69		69
70	m_scene = SceneHelpers.SetupScene();	70	m_scene = new SceneHelpers().SetupScene();
71	SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule());	71	SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule());
72		72
73	m_engine = new XEngine.XEngine();	73	m_engine = new XEngine.XEngine();


diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs index 9d9fc51..9c36108 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
68	config = initConfigSource.AddConfig("NPC");	68	config = initConfigSource.AddConfig("NPC");
69	config.Set("Enabled", "true");	69	config.Set("Enabled", "true");
70		70
71	m_scene = SceneHelpers.SetupScene();	71	m_scene = new SceneHelpers().SetupScene();
72	SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule());	72	SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule());
73		73
74	m_engine = new XEngine.XEngine();	74	m_engine = new XEngine.XEngine();