aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
diff options
context:
space:
mode:
authorRobert Adams2012-08-31 11:33:36 -0700
committerRobert Adams2012-08-31 11:41:33 -0700
commitffdc7987207de279116a077e2042ed3a1f381a5f (patch)
treebe0a30b79da8abf96ba826e370c62457658fda84 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
parentBulletSim: clean up some variable naming for consistancy. (diff)
downloadopensim-SC_OLD-ffdc7987207de279116a077e2042ed3a1f381a5f.zip
opensim-SC_OLD-ffdc7987207de279116a077e2042ed3a1f381a5f.tar.gz
opensim-SC_OLD-ffdc7987207de279116a077e2042ed3a1f381a5f.tar.bz2
opensim-SC_OLD-ffdc7987207de279116a077e2042ed3a1f381a5f.tar.xz
BulletSim: Update BulletSimAPI to match the DLL interface.
Major rework of terrain management which finally makes mega-regions work. Update heightmap of terrain by rebuilding the terrain's body and shape. There is a problem with just replacing the shape so this workaround will do for the moment but it will need to be resolved for mesh and hull switching.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index fa21233..747ae71 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -228,7 +228,7 @@ public class BSCharacter : BSPhysObject
228 float terrainHeight = Scene.TerrainManager.GetTerrainHeightAtXYZ(_position); 228 float terrainHeight = Scene.TerrainManager.GetTerrainHeightAtXYZ(_position);
229 if (Position.Z < terrainHeight) 229 if (Position.Z < terrainHeight)
230 { 230 {
231 DetailLog("{0},BSCharacter.PositionAdjustUnderGround,call,pos={1},terrain={2}", LocalID, _position, terrainHeight); 231 DetailLog("{0},BSCharacter.PositionAdjustUnderGround,call,pos={1},terrain={2}", LocalID, _position, terrainHeight);
232 _position.Z = terrainHeight + 2.0f; 232 _position.Z = terrainHeight + 2.0f;
233 ret = true; 233 ret = true;
234 } 234 }