diff options
author | Robert Adams | 2016-03-06 14:23:06 -0800 |
---|---|---|
committer | Robert Adams | 2016-03-06 14:23:06 -0800 |
commit | be43fc2234731c452842b6fd7c08a33ba568b3eb (patch) | |
tree | 4f6f12de43ff9ec79230404828238e45fe18dcf2 /OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | |
parent | Remove unused parameter ShouldUseFireAndForgetForCollisions. It was (diff) | |
download | opensim-SC-be43fc2234731c452842b6fd7c08a33ba568b3eb.zip opensim-SC-be43fc2234731c452842b6fd7c08a33ba568b3eb.tar.gz opensim-SC-be43fc2234731c452842b6fd7c08a33ba568b3eb.tar.bz2 opensim-SC-be43fc2234731c452842b6fd7c08a33ba568b3eb.tar.xz |
BulletSim: use the new 'setAvatarSize' physics call introduced in 0.9.
This disables all the avatar size fudge numbers previously used by BulletSim.
If you have your region tuned to the old way, set
"[BulletSim]AvatarUseBefore09SizeComputation=true" in your INI files.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs index 747bad5..bd9f325 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | |||
@@ -523,13 +523,13 @@ namespace OpenSim.Region.PhysicsModule.BulletS | |||
523 | return null; | 523 | return null; |
524 | } | 524 | } |
525 | 525 | ||
526 | public override PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying) | 526 | public override PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float footOffset, bool isFlying) |
527 | { | 527 | { |
528 | // m_log.DebugFormat("{0}: AddAvatar: {1}", LogHeader, avName); | 528 | // m_log.DebugFormat("{0}: AddAvatar: {1}", LogHeader, avName); |
529 | 529 | ||
530 | if (!m_initialized) return null; | 530 | if (!m_initialized) return null; |
531 | 531 | ||
532 | BSCharacter actor = new BSCharacter(localID, avName, this, position, velocity, size, isFlying); | 532 | BSCharacter actor = new BSCharacter(localID, avName, this, position, Vector3.Zero, size, footOffset, isFlying); |
533 | lock (PhysObjects) | 533 | lock (PhysObjects) |
534 | PhysObjects.Add(localID, actor); | 534 | PhysObjects.Add(localID, actor); |
535 | 535 | ||