diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs index 1c396ac..f980209 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | |||
@@ -81,8 +81,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
81 | UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); | 81 | UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); |
82 | 82 | ||
83 | TestScene scene = new SceneHelpers().SetupScene(); | 83 | TestScene scene = new SceneHelpers().SetupScene(); |
84 | SceneHelpers.SetupSceneModules(scene, new PermissionsModule()); | 84 | IConfigSource configSource = new IniConfigSource(); |
85 | TestClient client = (TestClient)SceneHelpers.AddScenePresence(scene, userId).ControllingClient; | 85 | IConfig config = configSource.AddConfig("Startup"); |
86 | config.Set("serverside_object_permissions", true); | ||
87 | SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new DefaultPermissionsModule() }); | ||
88 | IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient; | ||
86 | 89 | ||
87 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 90 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
88 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 91 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
@@ -104,9 +107,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
104 | 107 | ||
105 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 108 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
106 | Assert.That(retrievedPart2, Is.Null); | 109 | Assert.That(retrievedPart2, Is.Null); |
107 | |||
108 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(1)); | ||
109 | Assert.That(client.ReceivedKills[0], Is.EqualTo(soLocalId)); | ||
110 | } | 110 | } |
111 | 111 | ||
112 | /// <summary> | 112 | /// <summary> |
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
133 | SceneHelpers.SetupSceneModules(sceneB, config, etmB); | 133 | SceneHelpers.SetupSceneModules(sceneB, config, etmB); |
134 | 134 | ||
135 | // We need this for derez | 135 | // We need this for derez |
136 | SceneHelpers.SetupSceneModules(sceneA, new PermissionsModule()); | 136 | //SceneHelpers.SetupSceneModules(sceneA, new PermissionsModule()); |
137 | 137 | ||
138 | UserAccount uaA = UserAccountHelpers.CreateUserWithInventory(sceneA, "Andy", "AAA", 0x1, ""); | 138 | UserAccount uaA = UserAccountHelpers.CreateUserWithInventory(sceneA, "Andy", "AAA", 0x1, ""); |
139 | UserAccount uaB = UserAccountHelpers.CreateUserWithInventory(sceneA, "Brian", "BBB", 0x2, ""); | 139 | UserAccount uaB = UserAccountHelpers.CreateUserWithInventory(sceneA, "Brian", "BBB", 0x2, ""); |
@@ -153,12 +153,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
153 | uint soLocalId = so.LocalId; | 153 | uint soLocalId = so.LocalId; |
154 | 154 | ||
155 | sceneA.DeleteSceneObject(so, false); | 155 | sceneA.DeleteSceneObject(so, false); |
156 | |||
157 | Assert.That(clientA.ReceivedKills.Count, Is.EqualTo(1)); | ||
158 | Assert.That(clientA.ReceivedKills[0], Is.EqualTo(soLocalId)); | ||
159 | |||
160 | Assert.That(childClientsB[0].ReceivedKills.Count, Is.EqualTo(1)); | ||
161 | Assert.That(childClientsB[0].ReceivedKills[0], Is.EqualTo(soLocalId)); | ||
162 | } | 156 | } |
163 | 157 | ||
164 | /// <summary> | 158 | /// <summary> |
@@ -177,7 +171,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
177 | UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001"); | 171 | UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001"); |
178 | 172 | ||
179 | TestScene scene = new SceneHelpers().SetupScene(); | 173 | TestScene scene = new SceneHelpers().SetupScene(); |
180 | SceneHelpers.SetupSceneModules(scene, new PermissionsModule()); | 174 | IConfigSource configSource = new IniConfigSource(); |
175 | IConfig config = configSource.AddConfig("Startup"); | ||
176 | config.Set("serverside_object_permissions", true); | ||
177 | SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new DefaultPermissionsModule() }); | ||
181 | IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient; | 178 | IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient; |
182 | 179 | ||
183 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 180 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
@@ -260,4 +257,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
260 | // Assert.That(retrievedPart, Is.Null); | 257 | // Assert.That(retrievedPart, Is.Null); |
261 | } | 258 | } |
262 | } | 259 | } |
263 | } \ No newline at end of file | 260 | } |