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/ScenePresenceTeleportTests.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/ScenePresenceTeleportTests.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs index da93d44..42276dd 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs | |||
| @@ -281,7 +281,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 281 | // We need to set up the permisions module on scene B so that our later use of agent limit to deny | 281 | // We need to set up the permisions module on scene B so that our later use of agent limit to deny |
| 282 | // QueryAccess won't succeed anyway because administrators are always allowed in and the default | 282 | // QueryAccess won't succeed anyway because administrators are always allowed in and the default |
| 283 | // IsAdministrator if no permissions module is present is true. | 283 | // IsAdministrator if no permissions module is present is true. |
| 284 | SceneHelpers.SetupSceneModules(sceneB, config, new object[] { new PermissionsModule(), etmB }); | 284 | SceneHelpers.SetupSceneModules(sceneB, config, new object[] { new DefaultPermissionsModule(), etmB }); |
| 285 | 285 | ||
| 286 | // Shared scene modules | 286 | // Shared scene modules |
| 287 | SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm); | 287 | SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm); |
| @@ -446,7 +446,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 446 | // We need to set up the permisions module on scene B so that our later use of agent limit to deny | 446 | // We need to set up the permisions module on scene B so that our later use of agent limit to deny |
| 447 | // QueryAccess won't succeed anyway because administrators are always allowed in and the default | 447 | // QueryAccess won't succeed anyway because administrators are always allowed in and the default |
| 448 | // IsAdministrator if no permissions module is present is true. | 448 | // IsAdministrator if no permissions module is present is true. |
| 449 | SceneHelpers.SetupSceneModules(sceneB, config, new object[] { new PermissionsModule(), etmB }); | 449 | SceneHelpers.SetupSceneModules(sceneB, config, new object[] { new DefaultPermissionsModule(), etmB }); |
| 450 | 450 | ||
| 451 | // Shared scene modules | 451 | // Shared scene modules |
| 452 | SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm); | 452 | SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm); |
| @@ -659,4 +659,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 659 | // TestHelpers.DisableLogging(); | 659 | // TestHelpers.DisableLogging(); |
| 660 | } | 660 | } |
| 661 | } | 661 | } |
| 662 | } \ No newline at end of file | 662 | } |