diff options
| author | Melanie | 2013-03-29 01:08:33 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-29 01:08:33 +0000 |
| commit | 4cb8967f0adc8f15b0fc2ef887ef0dc440855297 (patch) | |
| tree | c9492e7afe37eb207f5264161136a5d20545e620 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: fix race condition when creating very large mega-regions. (diff) | |
| download | opensim-SC_OLD-4cb8967f0adc8f15b0fc2ef887ef0dc440855297.zip opensim-SC_OLD-4cb8967f0adc8f15b0fc2ef887ef0dc440855297.tar.gz opensim-SC_OLD-4cb8967f0adc8f15b0fc2ef887ef0dc440855297.tar.bz2 opensim-SC_OLD-4cb8967f0adc8f15b0fc2ef887ef0dc440855297.tar.xz | |
Merge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index e208d3a..90c2d9c 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -479,7 +479,7 @@ public sealed class BSCharacter : BSPhysObject | |||
| 479 | // The character is out of the known/simulated area. | 479 | // The character is out of the known/simulated area. |
| 480 | // Force the avatar position to be within known. ScenePresence will use the position | 480 | // Force the avatar position to be within known. ScenePresence will use the position |
| 481 | // plus the velocity to decide if the avatar is moving out of the region. | 481 | // plus the velocity to decide if the avatar is moving out of the region. |
| 482 | RawPosition = PhysicsScene.TerrainManager.ClampPositionIntoKnownTerrain(RawPosition); | 482 | RawPosition = PhysicsScene.TerrainManager.ClampPositionIntoKnownTerrain(RawPosition); |
| 483 | DetailLog("{0},BSCharacter.PositionSanityCheck,notWithinKnownTerrain,clampedPos={1}", LocalID, RawPosition); | 483 | DetailLog("{0},BSCharacter.PositionSanityCheck,notWithinKnownTerrain,clampedPos={1}", LocalID, RawPosition); |
| 484 | return true; | 484 | return true; |
| 485 | } | 485 | } |
| @@ -898,7 +898,7 @@ public sealed class BSCharacter : BSPhysObject | |||
| 898 | // Do some sanity checking for the avatar. Make sure it's above ground and inbounds. | 898 | // Do some sanity checking for the avatar. Make sure it's above ground and inbounds. |
| 899 | if (PositionSanityCheck(true)) | 899 | if (PositionSanityCheck(true)) |
| 900 | { | 900 | { |
| 901 | DetailLog("{0},BSCharacter.UpdateProperties,updatePosForSanity,pos={1}", LocalID, _position); | 901 | DetailLog("{0},BSCharacter.UpdateProperties,updatePosForSanity,pos={1}", LocalID, _position); |
| 902 | entprop.Position = _position; | 902 | entprop.Position = _position; |
| 903 | } | 903 | } |
| 904 | 904 | ||