diff options
author | Diva Canto | 2015-08-31 15:04:10 -0700 |
---|---|---|
committer | Diva Canto | 2015-08-31 15:04:10 -0700 |
commit | 50e7e38f450599b5755c9ab887b8d9bd9c3d8981 (patch) | |
tree | 28e578fbcb02a15a4a74814f6b56629a995690a9 /OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | |
parent | First commit where physics work as region module. (diff) | |
download | opensim-SC_OLD-50e7e38f450599b5755c9ab887b8d9bd9c3d8981.zip opensim-SC_OLD-50e7e38f450599b5755c9ab887b8d9bd9c3d8981.tar.gz opensim-SC_OLD-50e7e38f450599b5755c9ab887b8d9bd9c3d8981.tar.bz2 opensim-SC_OLD-50e7e38f450599b5755c9ab887b8d9bd9c3d8981.tar.xz |
Physics refactoring: all unit tests pass.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSScene.cs')
-rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs index b412561..d116c3b 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | |||
@@ -250,7 +250,9 @@ namespace OpenSim.Region.PhysicsModule.BulletS | |||
250 | Vector3 extent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ); | 250 | Vector3 extent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ); |
251 | Initialise(m_Config, extent); | 251 | Initialise(m_Config, extent); |
252 | 252 | ||
253 | base.Initialise(scene.PhysicsRequestAsset, scene.Heightmap.GetFloatsSerialised(), (float)scene.RegionInfo.RegionSettings.WaterHeight); | 253 | base.Initialise(scene.PhysicsRequestAsset, |
254 | (scene.Heightmap != null ? scene.Heightmap.GetFloatsSerialised() : new float[Constants.RegionSize * Constants.RegionSize]), | ||
255 | (float)scene.RegionInfo.RegionSettings.WaterHeight); | ||
254 | 256 | ||
255 | } | 257 | } |
256 | 258 | ||