diff options
| author | Robert Adams | 2012-11-28 08:05:01 -0800 |
|---|---|---|
| committer | Robert Adams | 2012-11-28 09:48:33 -0800 |
| commit | 0a66317fa6414dff9a7a4ab5bae10802e1e6693f (patch) | |
| tree | a0705a43191649f43c80d43ee8537f5ab6581e94 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-0a66317fa6414dff9a7a4ab5bae10802e1e6693f.zip opensim-SC-0a66317fa6414dff9a7a4ab5bae10802e1e6693f.tar.gz opensim-SC-0a66317fa6414dff9a7a4ab5bae10802e1e6693f.tar.bz2 opensim-SC-0a66317fa6414dff9a7a4ab5bae10802e1e6693f.tar.xz | |
BulletSim: move GetWaterLevelAtXYZ from BSScene to BSPhysTerrain.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 4c195e1..1dfc420 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -307,7 +307,7 @@ public sealed class BSCharacter : BSPhysObject | |||
| 307 | } | 307 | } |
| 308 | if ((CurrentCollisionFlags & CollisionFlags.BS_FLOATS_ON_WATER) != 0) | 308 | if ((CurrentCollisionFlags & CollisionFlags.BS_FLOATS_ON_WATER) != 0) |
| 309 | { | 309 | { |
| 310 | float waterHeight = PhysicsScene.GetWaterLevelAtXYZ(_position); | 310 | float waterHeight = PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(_position); |
| 311 | if (Position.Z < waterHeight) | 311 | if (Position.Z < waterHeight) |
| 312 | { | 312 | { |
| 313 | _position.Z = waterHeight; | 313 | _position.Z = waterHeight; |