diff options
| author | Justin Clark-Casey | 2014-05-27 23:29:54 +0100 |
|---|---|---|
| committer | Justin Clark-Casey | 2014-05-27 23:29:54 +0100 |
| commit | 3f703ae1cb02cbcb0efaff061d495bacca941de0 (patch) | |
| tree | 3221068b4bc4119023b3dfa621c19e126c2eb3f3 /OpenSim/Region/Physics/BasicPhysicsPlugin | |
| parent | Merge branch 'master' into 0.8-post-fixes (diff) | |
| parent | minor: Comment out 2 error level debugging message in authentication code (diff) | |
| download | opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.zip opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.gz opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.bz2 opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.xz | |
Merge branch 'master' into 0.8-post-fixes
Diffstat (limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin')
| -rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs index 8e40561..f53adcb 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | |||
| @@ -147,6 +147,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
| 147 | terrainHeight = _heightMap[(int)actor.Position.Y * (int)m_regionExtent.Y + (int)actor.Position.X]; | 147 | terrainHeight = _heightMap[(int)actor.Position.Y * (int)m_regionExtent.Y + (int)actor.Position.X]; |
| 148 | 148 | ||
| 149 | float height = terrainHeight + actor.Size.Z; | 149 | float height = terrainHeight + actor.Size.Z; |
| 150 | // Console.WriteLine("height {0}, actorPosition {1}", height, actorPosition); | ||
| 150 | 151 | ||
| 151 | if (actor.Flying) | 152 | if (actor.Flying) |
| 152 | { | 153 | { |