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/Region/PhysicsModules/Ode/OdeScene.cs | |
| parent | All physics plugins are now region modules. Compiles but doesn't run. (diff) | |
| download | opensim-SC-11194209df8a29f5103e6e34104eae7834f3280a.zip opensim-SC-11194209df8a29f5103e6e34104eae7834f3280a.tar.gz opensim-SC-11194209df8a29f5103e6e34104eae7834f3280a.tar.bz2 opensim-SC-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 '')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs index 3616200..f090953 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | |||
| @@ -585,6 +585,8 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
| 585 | Vector3 extent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ); | 585 | Vector3 extent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ); |
| 586 | Initialise(); | 586 | Initialise(); |
| 587 | InitialiseFromConfig(m_config); | 587 | InitialiseFromConfig(m_config); |
| 588 | base.Initialise(scene.PhysicsRequestAsset, scene.Heightmap.GetFloatsSerialised(), (float)scene.RegionInfo.RegionSettings.WaterHeight); | ||
| 589 | |||
| 588 | } | 590 | } |
| 589 | 591 | ||
| 590 | public void RemoveRegion(Scene scene) | 592 | public void RemoveRegion(Scene scene) |