diff options
author | Diva Canto | 2015-08-31 14:09:15 -0700 |
---|---|---|
committer | Diva Canto | 2015-08-31 14:09:15 -0700 |
commit | 11194209df8a29f5103e6e34104eae7834f3280a (patch) | |
tree | 605cd55258ef11167a8bfa4c894e1e026e172919 /OpenSim/Tests/Common/Helpers | |
parent | All physics plugins are now region modules. Compiles but doesn't run. (diff) | |
download | opensim-SC_OLD-11194209df8a29f5103e6e34104eae7834f3280a.zip opensim-SC_OLD-11194209df8a29f5103e6e34104eae7834f3280a.tar.gz opensim-SC_OLD-11194209df8a29f5103e6e34104eae7834f3280a.tar.bz2 opensim-SC_OLD-11194209df8a29f5103e6e34104eae7834f3280a.tar.xz |
First commit where physics work as region module.
Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader.
Removed call to PhysicsPluginManager.
Diffstat (limited to 'OpenSim/Tests/Common/Helpers')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index a26e844..27705bd 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -151,12 +151,9 @@ namespace OpenSim.Tests.Common | |||
151 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); | 151 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); |
152 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.PhysicsModule.BasicPhysics.dll"); | 152 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.PhysicsModule.BasicPhysics.dll"); |
153 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); | 153 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); |
154 | PhysicsScene physicsScene | ||
155 | = physicsPluginManager.GetPhysicsScene( | ||
156 | "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); | ||
157 | 154 | ||
158 | TestScene testScene = new TestScene( | 155 | TestScene testScene = new TestScene( |
159 | regInfo, m_acm, physicsScene, SimDataService, m_estateDataService, configSource, null); | 156 | regInfo, m_acm, SimDataService, m_estateDataService, configSource, null); |
160 | 157 | ||
161 | INonSharedRegionModule godsModule = new GodsModule(); | 158 | INonSharedRegionModule godsModule = new GodsModule(); |
162 | godsModule.Initialise(new IniConfigSource()); | 159 | godsModule.Initialise(new IniConfigSource()); |