ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix previous commit to ignore water height and allow flying underwater (swimming)

Browse Source 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
This commit is contained in:
AliciaRaven
2014-06-18 04:13:45 +01:00
committed by Michael Cerquoni
parent ff892b5bcf
commit db0c41501c
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
View File

@@ -139,21 +139,6 @@ public class BSActorAvatarMove : BSActor
}
}
private float ComputeMinFlightHeight()
{
float waterHeight = m_physicsScene.TerrainManager.GetWaterLevelAtXYZ(m_controllingPrim.RawPosition);
float groundHeight = m_physicsScene.TerrainManager.GetTerrainHeightAtXYZ(m_controllingPrim.RawPosition);
if (groundHeight > waterHeight)
{
return groundHeight + 8f;
}
else
{
return waterHeight + 8f;
}
}
private void DeactivateAvatarMove()
{
if (m_velocityMotor != null)
@@ -283,7 +268,7 @@ public class BSActorAvatarMove : BSActor
//Alicia: Maintain minimum height when flying
if (m_controllingPrim.Flying)
{
float hover_height = ComputeMinFlightHeight();
float hover_height = m_physicsScene.TerrainManager.GetTerrainHeightAtXYZ(m_controllingPrim.RawPosition) + 8f;
if( m_controllingPrim.Position.Z < hover_height)
{