aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDiva Canto2009-09-28 17:42:35 -0700
committerDiva Canto2009-09-28 17:42:35 -0700
commita60ed0562ca403b5881e221ccbdd8366ff053a27 (patch)
tree6c7bb629afb47c21fe6ecd42300cbcc16ebe4be7 /OpenSim/Region/Framework
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-a60ed0562ca403b5881e221ccbdd8366ff053a27.zip
opensim-SC_OLD-a60ed0562ca403b5881e221ccbdd8366ff053a27.tar.gz
opensim-SC_OLD-a60ed0562ca403b5881e221ccbdd8366ff053a27.tar.bz2
opensim-SC_OLD-a60ed0562ca403b5881e221ccbdd8366ff053a27.tar.xz
I think I have fixed something that was broken in the scene setup (tests) and that needs to be reflected in all other services setups. But the teleport test still doesn't work. Commenting it for now.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 1dc1627..751c1cd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -118,14 +118,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests
118 // shared module 118 // shared module
119 ISharedRegionModule interregionComms = new RESTInterregionComms(); 119 ISharedRegionModule interregionComms = new RESTInterregionComms();
120 120
121 Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm, "grid");
122 SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
123 sceneA.RegisterRegionWithGrid();
124 121
125 Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm, "grid"); 122 Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm, "grid");
126 SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms); 123 SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms);
127 sceneB.RegisterRegionWithGrid(); 124 sceneB.RegisterRegionWithGrid();
128 125
126 Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm, "grid");
127 SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
128 sceneA.RegisterRegionWithGrid();
129
129 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041"); 130 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041");
130 TestClient client = SceneSetupHelpers.AddRootAgent(sceneA, agentId); 131 TestClient client = SceneSetupHelpers.AddRootAgent(sceneA, agentId);
131 132