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/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
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-90305001de2dc043fa76760367ac22de0056686a.zip
opensim-SC-90305001de2dc043fa76760367ac22de0056686a.tar.gz
opensim-SC-90305001de2dc043fa76760367ac22de0056686a.tar.bz2
opensim-SC-90305001de2dc043fa76760367ac22de0056686a.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index 654b1a2..0076f41 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                        
            UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
            
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
            IConfigSource configSource = new IniConfigSource();
            IConfig config = configSource.AddConfig("Startup");
            config.Set("serverside_object_permissions", true);
@@ -100,7 +100,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
            UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
            
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
            IConfigSource configSource = new IniConfigSource();
            IConfig config = configSource.AddConfig("Startup");
            config.Set("serverside_object_permissions", true);
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/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
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-90305001de2dc043fa76760367ac22de0056686a.zip opensim-SC-90305001de2dc043fa76760367ac22de0056686a.tar.gz opensim-SC-90305001de2dc043fa76760367ac22de0056686a.tar.bz2 opensim-SC-90305001de2dc043fa76760367ac22de0056686a.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs index 654b1a2..0076f41 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
61		61
62	UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");	62	UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
63		63
64	TestScene scene = SceneHelpers.SetupScene();	64	TestScene scene = new SceneHelpers().SetupScene();
65	IConfigSource configSource = new IniConfigSource();	65	IConfigSource configSource = new IniConfigSource();
66	IConfig config = configSource.AddConfig("Startup");	66	IConfig config = configSource.AddConfig("Startup");
67	config.Set("serverside_object_permissions", true);	67	config.Set("serverside_object_permissions", true);
@@ -100,7 +100,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
100	UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");	100	UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
101	UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");	101	UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
102		102
103	TestScene scene = SceneHelpers.SetupScene();	103	TestScene scene = new SceneHelpers().SetupScene();
104	IConfigSource configSource = new IniConfigSource();	104	IConfigSource configSource = new IniConfigSource();
105	IConfig config = configSource.AddConfig("Startup");	105	IConfig config = configSource.AddConfig("Startup");
106	config.Set("serverside_object_permissions", true);	106	config.Set("serverside_object_permissions", true);