diff options
author | diva | 2009-02-15 05:00:58 +0000 |
---|---|---|
committer | diva | 2009-02-15 05:00:58 +0000 |
commit | 3d5a9e6748ef743c4db04b427d4d76ea65269618 (patch) | |
tree | 1877a66c0ca1f4caa455a7f98dd221897e687620 /OpenSim/Region/Physics/BulletXPlugin | |
parent | Set sculpt map alpha to 255 prior to scaling and meshing. Addresses Mantis #3150 (diff) | |
download | opensim-SC-3d5a9e6748ef743c4db04b427d4d76ea65269618.zip opensim-SC-3d5a9e6748ef743c4db04b427d4d76ea65269618.tar.gz opensim-SC-3d5a9e6748ef743c4db04b427d4d76ea65269618.tar.bz2 opensim-SC-3d5a9e6748ef743c4db04b427d4d76ea65269618.tar.xz |
This started as way to correct Mantis #3158, which I believe should be fixed now. The flying status was temporarily being ignored, which caused the avie to drop sometimes -- there was a race condition. In the process it also fixes that annoying bug in basic physics where the avie would drop half-way to the ground upon region crossings (SetAppearance was missing). Additionally, a lot of child-agent-related code has been cleaned up; namely child agents are now consistently not added to physical scenes, and they also don't have appearances. All of that happens in MakeRoot, consistently.
Diffstat (limited to 'OpenSim/Region/Physics/BulletXPlugin')
-rw-r--r-- | OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index 29a19de..8891163 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | |||
@@ -573,13 +573,14 @@ namespace OpenSim.Region.Physics.BulletXPlugin | |||
573 | 573 | ||
574 | } | 574 | } |
575 | 575 | ||
576 | public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size) | 576 | public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size, bool isFlying) |
577 | { | 577 | { |
578 | PhysicsVector pos = new PhysicsVector(); | 578 | PhysicsVector pos = new PhysicsVector(); |
579 | pos.X = position.X; | 579 | pos.X = position.X; |
580 | pos.Y = position.Y; | 580 | pos.Y = position.Y; |
581 | pos.Z = position.Z + 20; | 581 | pos.Z = position.Z + 20; |
582 | BulletXCharacter newAv = null; | 582 | BulletXCharacter newAv = null; |
583 | newAv.Flying = isFlying; | ||
583 | lock (BulletXLock) | 584 | lock (BulletXLock) |
584 | { | 585 | { |
585 | newAv = new BulletXCharacter(avName, this, pos); | 586 | newAv = new BulletXCharacter(avName, this, pos); |