diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 17 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 5 |
2 files changed, 12 insertions, 10 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 342cd06..ae2be70 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -151,8 +151,15 @@ namespace OpenSim.Tests.Common | |||
151 | 151 | ||
152 | SceneCommunicationService scs = new SceneCommunicationService(); | 152 | SceneCommunicationService scs = new SceneCommunicationService(); |
153 | 153 | ||
154 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); | ||
155 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); | ||
156 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); | ||
157 | PhysicsScene physicsScene | ||
158 | = physicsPluginManager.GetPhysicsScene( | ||
159 | "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); | ||
160 | |||
154 | TestScene testScene = new TestScene( | 161 | TestScene testScene = new TestScene( |
155 | regInfo, m_acm, scs, SimDataService, m_estateDataService, configSource, null); | 162 | regInfo, m_acm, physicsScene, scs, SimDataService, m_estateDataService, configSource, null); |
156 | 163 | ||
157 | INonSharedRegionModule godsModule = new GodsModule(); | 164 | INonSharedRegionModule godsModule = new GodsModule(); |
158 | godsModule.Initialise(new IniConfigSource()); | 165 | godsModule.Initialise(new IniConfigSource()); |
@@ -195,13 +202,7 @@ namespace OpenSim.Tests.Common | |||
195 | testScene.SetModuleInterfaces(); | 202 | testScene.SetModuleInterfaces(); |
196 | 203 | ||
197 | testScene.LandChannel = new TestLandChannel(testScene); | 204 | testScene.LandChannel = new TestLandChannel(testScene); |
198 | testScene.LoadWorldMap(); | 205 | testScene.LoadWorldMap(); |
199 | |||
200 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); | ||
201 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); | ||
202 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); | ||
203 | testScene.PhysicsScene | ||
204 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); | ||
205 | 206 | ||
206 | testScene.RegionInfo.EstateSettings = new EstateSettings(); | 207 | testScene.RegionInfo.EstateSettings = new EstateSettings(); |
207 | testScene.LoginsEnabled = true; | 208 | testScene.LoginsEnabled = true; |
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 2773624..40e2adc 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
@@ -33,6 +33,7 @@ using OpenSim.Framework.Servers; | |||
33 | using OpenSim.Region.Framework; | 33 | using OpenSim.Region.Framework; |
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.Physics.Manager; | ||
36 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
37 | 38 | ||
38 | namespace OpenSim.Tests.Common.Mock | 39 | namespace OpenSim.Tests.Common.Mock |
@@ -40,10 +41,10 @@ namespace OpenSim.Tests.Common.Mock | |||
40 | public class TestScene : Scene | 41 | public class TestScene : Scene |
41 | { | 42 | { |
42 | public TestScene( | 43 | public TestScene( |
43 | RegionInfo regInfo, AgentCircuitManager authen, | 44 | RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene, |
44 | SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, | 45 | SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, |
45 | IConfigSource config, string simulatorVersion) | 46 | IConfigSource config, string simulatorVersion) |
46 | : base(regInfo, authen, sceneGridService, simDataService, estateDataService, | 47 | : base(regInfo, authen, physicsScene, sceneGridService, simDataService, estateDataService, |
47 | config, simulatorVersion) | 48 | config, simulatorVersion) |
48 | { | 49 | { |
49 | } | 50 | } |