aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
diff options
context:
space:
mode:
authorDiva Canto2014-05-23 16:20:04 -0700
committerDiva Canto2014-05-23 16:20:04 -0700
commit227685bea437d3e62c305e87415f5183a603d278 (patch)
tree017f81fbf28f5944b6d26aa4833b30e1b52c9be7 /OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs
parentAdds optional HTTP Basic Authentication to Robust service connectors. (diff)
parentFix issues where reported LSL compiler error line numbers do not match the sc... (diff)
downloadopensim-SC-227685bea437d3e62c305e87415f5183a603d278.zip
opensim-SC-227685bea437d3e62c305e87415f5183a603d278.tar.gz
opensim-SC-227685bea437d3e62c305e87415f5183a603d278.tar.bz2
opensim-SC-227685bea437d3e62c305e87415f5183a603d278.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs')
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs1
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 {