diff options
| author | BlueWall | 2011-04-14 21:16:30 -0400 |
|---|---|---|
| committer | BlueWall | 2011-04-14 21:16:30 -0400 |
| commit | 37d2b6243be94ed3e71c0332e5aab7ddba1d1f69 (patch) | |
| tree | 8d04f5f9dcdc9980497b60e5b13f8e31803238ab /OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | |
| parent | Add ColladaMesh switch (diff) | |
| parent | get rid of all traces of the now used mock service infrastructure (diff) | |
| download | opensim-SC_OLD-37d2b6243be94ed3e71c0332e5aab7ddba1d1f69.zip opensim-SC_OLD-37d2b6243be94ed3e71c0332e5aab7ddba1d1f69.tar.gz opensim-SC_OLD-37d2b6243be94ed3e71c0332e5aab7ddba1d1f69.tar.bz2 opensim-SC_OLD-37d2b6243be94ed3e71c0332e5aab7ddba1d1f69.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 | ||