diff options
author | UbitUmarov | 2015-11-19 01:18:34 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-19 01:18:34 +0000 |
commit | f242137e31e5bce4725753b97e221b83a4c6552a (patch) | |
tree | fd1532cec714612e43bc305bba4900d75348d72b /OpenSim/Region/Framework | |
parent | cleanup indentation (diff) | |
download | opensim-SC_OLD-f242137e31e5bce4725753b97e221b83a4c6552a.zip opensim-SC_OLD-f242137e31e5bce4725753b97e221b83a4c6552a.tar.gz opensim-SC_OLD-f242137e31e5bce4725753b97e221b83a4c6552a.tar.bz2 opensim-SC_OLD-f242137e31e5bce4725753b97e221b83a4c6552a.tar.xz |
work around some 'tests' errors: add a DefaultPermitions module to sceneB
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs | 5 |
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; | |||
39 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; | 39 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; |
40 | using OpenSim.Region.CoreModules.World.Permissions; | 40 | using OpenSim.Region.CoreModules.World.Permissions; |
41 | using OpenSim.Tests.Common; | 41 | using OpenSim.Tests.Common; |
42 | using System.Threading; | ||
42 | 43 | ||
43 | namespace OpenSim.Region.Framework.Scenes.Tests | 44 | namespace 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 |