diff options
| author | Mic Bowman | 2011-04-18 11:29:43 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-18 11:29:43 -0700 |
| commit | 452ae375f0fdd62ba16fb170869ea470c6906cfe (patch) | |
| tree | b5a7d364e509f2ff7f1b9086e2ba5658f4ee99ac /OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | |
| parent | Remove the call to remove tokens from the parent. Under heavy load (diff) | |
| parent | Mantis #5442: Add admin_save_heightmap (diff) | |
| download | opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.zip opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.gz opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.bz2 opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.xz | |
Merge branch 'master' into test-merge0418
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs index 8588f7f..dd28416 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | |||
| @@ -117,11 +117,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 117 | ISharedRegionModule interregionComms = new LocalSimulationConnectorModule(); | 117 | ISharedRegionModule interregionComms = new LocalSimulationConnectorModule(); |
| 118 | 118 | ||
| 119 | 119 | ||
| 120 | Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, "grid"); | 120 | Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010); |
| 121 | SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms); | 121 | SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms); |
| 122 | sceneB.RegisterRegionWithGrid(); | 122 | sceneB.RegisterRegionWithGrid(); |
| 123 | 123 | ||
| 124 | Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, "grid"); | 124 | Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000); |
| 125 | SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms); | 125 | SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms); |
| 126 | sceneA.RegisterRegionWithGrid(); | 126 | sceneA.RegisterRegionWithGrid(); |
| 127 | 127 | ||