diff options
author | UbitUmarov | 2015-08-19 11:04:28 +0100 |
---|---|---|
committer | UbitUmarov | 2015-08-19 11:04:28 +0100 |
commit | 0af2fafddf36009ffe470da106dc6d0ceb3ced10 (patch) | |
tree | c5d2a58398fcc4bd1b4722a8379ce9bb643fe8e5 /OpenSim/Tests/Common/Helpers | |
parent | Merge branch 'mbworkvar2' into ubitvar (diff) | |
download | opensim-SC-0af2fafddf36009ffe470da106dc6d0ceb3ced10.zip opensim-SC-0af2fafddf36009ffe470da106dc6d0ceb3ced10.tar.gz opensim-SC-0af2fafddf36009ffe470da106dc6d0ceb3ced10.tar.bz2 opensim-SC-0af2fafddf36009ffe470da106dc6d0ceb3ced10.tar.xz |
add missing regionExtent setup and Scene physicsscene configuration ( not
exactly as core)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 4cdfe98..d36e42e 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -138,8 +138,15 @@ namespace OpenSim.Tests.Common | |||
138 | 138 | ||
139 | SceneCommunicationService scs = new SceneCommunicationService(); | 139 | SceneCommunicationService scs = new SceneCommunicationService(); |
140 | 140 | ||
141 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); | ||
142 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); | ||
143 | Vector3 regionExtent = new Vector3(regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); | ||
144 | PhysicsScene physicsScene | ||
145 | = physicsPluginManager.GetPhysicsScene( | ||
146 | "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); | ||
147 | |||
141 | TestScene testScene = new TestScene( | 148 | TestScene testScene = new TestScene( |
142 | regInfo, m_acm, scs, m_simDataService, m_estateDataService, configSource, null); | 149 | regInfo, m_acm, physicsScene, scs, m_simDataService, m_estateDataService, configSource, null); |
143 | 150 | ||
144 | INonSharedRegionModule godsModule = new GodsModule(); | 151 | INonSharedRegionModule godsModule = new GodsModule(); |
145 | godsModule.Initialise(new IniConfigSource()); | 152 | godsModule.Initialise(new IniConfigSource()); |
@@ -184,11 +191,6 @@ namespace OpenSim.Tests.Common | |||
184 | testScene.LandChannel = new TestLandChannel(testScene); | 191 | testScene.LandChannel = new TestLandChannel(testScene); |
185 | testScene.LoadWorldMap(); | 192 | testScene.LoadWorldMap(); |
186 | 193 | ||
187 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); | ||
188 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); | ||
189 | testScene.PhysicsScene | ||
190 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test"); | ||
191 | |||
192 | testScene.RegionInfo.EstateSettings = new EstateSettings(); | 194 | testScene.RegionInfo.EstateSettings = new EstateSettings(); |
193 | testScene.LoginsEnabled = true; | 195 | testScene.LoginsEnabled = true; |
194 | testScene.RegisterRegionWithGrid(); | 196 | testScene.RegisterRegionWithGrid(); |