aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Helpers/SceneHelpers.cs4
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs4
2 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 1fb1c5c..4f685b6 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -148,8 +148,6 @@ namespace OpenSim.Tests.Common
148 regInfo.RegionSizeX = sizeX; 148 regInfo.RegionSizeX = sizeX;
149 regInfo.RegionSizeY = sizeY; 149 regInfo.RegionSizeY = sizeY;
150 150
151 SceneCommunicationService scs = new SceneCommunicationService();
152
153 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); 151 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
154 physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); 152 physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
155 Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); 153 Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ);
@@ -158,7 +156,7 @@ namespace OpenSim.Tests.Common
158 "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); 156 "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent);
159 157
160 TestScene testScene = new TestScene( 158 TestScene testScene = new TestScene(
161 regInfo, m_acm, physicsScene, scs, SimDataService, m_estateDataService, configSource, null); 159 regInfo, m_acm, physicsScene, SimDataService, m_estateDataService, configSource, null);
162 160
163 INonSharedRegionModule godsModule = new GodsModule(); 161 INonSharedRegionModule godsModule = new GodsModule();
164 godsModule.Initialise(new IniConfigSource()); 162 godsModule.Initialise(new IniConfigSource());
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 45acf91..bd36097 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -42,9 +42,9 @@ namespace OpenSim.Tests.Common
42 { 42 {
43 public TestScene( 43 public TestScene(
44 RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene, 44 RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene,
45 SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, 45 ISimulationDataService simDataService, IEstateDataService estateDataService,
46 IConfigSource config, string simulatorVersion) 46 IConfigSource config, string simulatorVersion)
47 : base(regInfo, authen, physicsScene, sceneGridService, simDataService, estateDataService, 47 : base(regInfo, authen, physicsScene, simDataService, estateDataService,
48 config, simulatorVersion) 48 config, simulatorVersion)
49 { 49 {
50 } 50 }