aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
index 37eec52..2255869 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
@@ -39,6 +39,7 @@ using OpenSim.Region.CoreModules.Framework.EntityTransfer;
39using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; 39using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
40using OpenSim.Region.CoreModules.World.Permissions; 40using OpenSim.Region.CoreModules.World.Permissions;
41using OpenSim.Tests.Common; 41using OpenSim.Tests.Common;
42using System.Threading;
42 43
43namespace OpenSim.Region.Framework.Scenes.Tests 44namespace OpenSim.Region.Framework.Scenes.Tests
44{ 45{
@@ -190,7 +191,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
190 // We need to set up the permisions module on scene B so that our later use of agent limit to deny 191 // We need to set up the permisions module on scene B so that our later use of agent limit to deny
191 // QueryAccess won't succeed anyway because administrators are always allowed in and the default 192 // QueryAccess won't succeed anyway because administrators are always allowed in and the default
192 // IsAdministrator if no permissions module is present is true. 193 // IsAdministrator if no permissions module is present is true.
193// SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), new PermissionsModule(), etmB); 194 SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), new DefaultPermissionsModule(), etmB);
194 195
195 AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId); 196 AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
196 TestClient tc = new TestClient(acd, sceneA); 197 TestClient tc = new TestClient(acd, sceneA);
@@ -229,7 +230,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
229 230
230 ScenePresence spAfterCrossSceneB = sceneB.GetScenePresence(originalSp.UUID); 231 ScenePresence spAfterCrossSceneB = sceneB.GetScenePresence(originalSp.UUID);
231 232
232 // sceneB agent should also still be root 233 // sceneB agent should still be child
233 Assert.That(spAfterCrossSceneB.IsChildAgent, Is.True); 234 Assert.That(spAfterCrossSceneB.IsChildAgent, Is.True);
234 235
235 // sceneB should ignore unauthorized attempt to upgrade agent to root 236 // sceneB should ignore unauthorized attempt to upgrade agent to root