diff options
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs index 52ad538..bde15cd 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | |||
| @@ -59,15 +59,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 59 | public void TestDeRezSceneObject() | 59 | public void TestDeRezSceneObject() |
| 60 | { | 60 | { |
| 61 | TestHelpers.InMethod(); | 61 | TestHelpers.InMethod(); |
| 62 | // log4net.Config.XmlConfigurator.Configure(); | ||
| 63 | 62 | ||
| 64 | UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); | 63 | UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); |
| 65 | 64 | ||
| 66 | TestScene scene = new SceneHelpers().SetupScene(); | 65 | TestScene scene = new SceneHelpers().SetupScene(); |
| 67 | IConfigSource configSource = new IniConfigSource(); | 66 | SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() }); |
| 68 | IConfig config = configSource.AddConfig("Startup"); | ||
| 69 | config.Set("serverside_object_permissions", true); | ||
| 70 | SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() }); | ||
| 71 | IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient; | 67 | IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient; |
| 72 | 68 | ||
| 73 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 69 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
| @@ -97,8 +93,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 97 | /// <summary> | 93 | /// <summary> |
| 98 | /// Test deleting an object from a scene where the deleter is not the owner | 94 | /// Test deleting an object from a scene where the deleter is not the owner |
| 99 | /// </summary> | 95 | /// </summary> |
| 100 | /// | 96 | /// <remarks> |
| 101 | /// This test assumes that the deleter is not a god. | 97 | /// This test assumes that the deleter is not a god. |
| 98 | /// </remarks> | ||
| 102 | [Test] | 99 | [Test] |
| 103 | public void TestDeRezSceneObjectNotOwner() | 100 | public void TestDeRezSceneObjectNotOwner() |
| 104 | { | 101 | { |
| @@ -109,10 +106,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 109 | UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001"); | 106 | UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001"); |
| 110 | 107 | ||
| 111 | TestScene scene = new SceneHelpers().SetupScene(); | 108 | TestScene scene = new SceneHelpers().SetupScene(); |
| 112 | IConfigSource configSource = new IniConfigSource(); | 109 | SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() }); |
| 113 | IConfig config = configSource.AddConfig("Startup"); | ||
| 114 | config.Set("serverside_object_permissions", true); | ||
| 115 | SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() }); | ||
| 116 | IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient; | 110 | IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient; |
| 117 | 111 | ||
| 118 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 112 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |