diff options
| author | Melanie | 2009-10-02 19:03:22 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-02 19:03:22 +0100 |
| commit | ce8974539e2de92e0a16a49ae560ecf5aac5e7d3 (patch) | |
| tree | a8f426b248dd22581c05f786498d6347b62f5825 /OpenSim/Tests/Common/Setup | |
| parent | Merge branch 'diva-textures-osgrid' into diva-textures (diff) | |
| parent | Added a default for grid services in standalone. (diff) | |
| download | opensim-SC_OLD-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.zip opensim-SC_OLD-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.tar.gz opensim-SC_OLD-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.tar.bz2 opensim-SC_OLD-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.tar.xz | |
Merge branch 'master' into diva-textures
Diffstat (limited to 'OpenSim/Tests/Common/Setup')
| -rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 4 |
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(); |