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/POS | |
parent | First commit where physics work as region module. (diff) | |
download | opensim-SC-50e7e38f450599b5755c9ab887b8d9bd9c3d8981.zip opensim-SC-50e7e38f450599b5755c9ab887b8d9bd9c3d8981.tar.gz opensim-SC-50e7e38f450599b5755c9ab887b8d9bd9c3d8981.tar.bz2 opensim-SC-50e7e38f450599b5755c9ab887b8d9bd9c3d8981.tar.xz |
Physics refactoring: all unit tests pass.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/POS')
-rw-r--r-- | OpenSim/Region/PhysicsModules/POS/POSScene.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/POS/POSScene.cs b/OpenSim/Region/PhysicsModules/POS/POSScene.cs index beaa177..f47d245 100644 --- a/OpenSim/Region/PhysicsModules/POS/POSScene.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSScene.cs | |||
@@ -85,7 +85,9 @@ namespace OpenSim.Region.PhysicsModule.POS | |||
85 | PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName; | 85 | PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName; |
86 | 86 | ||
87 | scene.RegisterModuleInterface<PhysicsScene>(this); | 87 | scene.RegisterModuleInterface<PhysicsScene>(this); |
88 | base.Initialise(scene.PhysicsRequestAsset, scene.Heightmap.GetFloatsSerialised(), (float)scene.RegionInfo.RegionSettings.WaterHeight); | 88 | base.Initialise(scene.PhysicsRequestAsset, |
89 | (scene.Heightmap != null ? scene.Heightmap.GetFloatsSerialised() : new float[Constants.RegionSize * Constants.RegionSize]), | ||
90 | (float)scene.RegionInfo.RegionSettings.WaterHeight); | ||
89 | 91 | ||
90 | } | 92 | } |
91 | 93 | ||