diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs index e14da8b..c193a97 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs | |||
@@ -191,7 +191,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
191 | // 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 |
192 | // 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 |
193 | // IsAdministrator if no permissions module is present is true. | 193 | // IsAdministrator if no permissions module is present is true. |
194 | SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), new PermissionsModule(), etmB); | 194 | // SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), new PermissionsModule(), etmB); |
195 | 195 | ||
196 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId); | 196 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId); |
197 | TestClient tc = new TestClient(acd, sceneA); | 197 | TestClient tc = new TestClient(acd, sceneA); |
@@ -245,4 +245,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
245 | Assert.That(spAfterCrossSceneB.IsChildAgent, Is.True); | 245 | Assert.That(spAfterCrossSceneB.IsChildAgent, Is.True); |
246 | } | 246 | } |
247 | } | 247 | } |
248 | } \ No newline at end of file | 248 | } |