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/SharedBase/PhysicsScene.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/SharedBase/PhysicsScene.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs index 247f355..32691fc 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs | |||
@@ -117,6 +117,14 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
117 | 117 | ||
118 | public RequestAssetDelegate RequestAssetMethod { get; set; } | 118 | public RequestAssetDelegate RequestAssetMethod { get; set; } |
119 | 119 | ||
120 | protected void Initialise(RequestAssetDelegate m, float[] terrain, float waterHeight) | ||
121 | { | ||
122 | RequestAssetMethod = m; | ||
123 | SetTerrain(terrain); | ||
124 | SetWaterLevel(waterHeight); | ||
125 | |||
126 | } | ||
127 | |||
120 | public virtual void TriggerPhysicsBasedRestart() | 128 | public virtual void TriggerPhysicsBasedRestart() |
121 | { | 129 | { |
122 | physicsCrash handler = OnPhysicsCrash; | 130 | physicsCrash handler = OnPhysicsCrash; |