aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
diff options
context:
space:
mode:
authorMelanie2009-10-02 19:04:46 +0100
committerMelanie2009-10-02 19:04:46 +0100
commit46955f42608ceb2b76731432f536e04e85521a12 (patch)
tree37e8591bd95de33ad0c485626c6f40f7d4bd91b5 /OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
parentRevert "* Adding Scale to EntityBase * Fixing the incorrect initialization of... (diff)
parentAdded a default for grid services in standalone. (diff)
downloadopensim-SC-46955f42608ceb2b76731432f536e04e85521a12.zip
opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.tar.gz
opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.tar.bz2
opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.tar.xz
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 53f24d9..eab5422 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Tests.Common.Setup
127 public static TestScene SetupScene( 127 public static TestScene SetupScene(
128 string name, UUID id, uint x, uint y, TestCommunicationsManager cm, String realServices) 128 string name, UUID id, uint x, uint y, TestCommunicationsManager cm, String realServices)
129 { 129 {
130 bool newScene= false; 130 bool newScene = false;
131 131
132 Console.WriteLine("Setting up test scene {0}", name); 132 Console.WriteLine("Setting up test scene {0}", name);
133 133
@@ -198,7 +198,7 @@ namespace OpenSim.Tests.Common.Setup
198 198
199 testScene.SetModuleInterfaces(); 199 testScene.SetModuleInterfaces();
200 200
201 testScene.LandChannel = new TestLandChannel(); 201 testScene.LandChannel = new TestLandChannel(testScene);
202 testScene.LoadWorldMap(); 202 testScene.LoadWorldMap();
203 203
204 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); 204 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();