diff options
| author | Justin Clark-Casey (justincc) | 2014-05-22 19:18:24 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-05-22 19:18:24 +0100 |
| commit | 1b156b7fe84bf132b51ff198d6d730708f5930b7 (patch) | |
| tree | 94e68fffd365328c8d9be7571d8cbef478c90358 /OpenSim/Region/Physics | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-1b156b7fe84bf132b51ff198d6d730708f5930b7.zip opensim-SC_OLD-1b156b7fe84bf132b51ff198d6d730708f5930b7.tar.gz opensim-SC_OLD-1b156b7fe84bf132b51ff198d6d730708f5930b7.tar.bz2 opensim-SC_OLD-1b156b7fe84bf132b51ff198d6d730708f5930b7.tar.xz | |
Add regression test for in-range chat between neighbouring regions from east to west.
Diffstat (limited to 'OpenSim/Region/Physics')
| -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 | { |