From 04e7fcd0e93300ec25758727ab5cfbb80942e97f Mon Sep 17 00:00:00 2001 From: dan miller Date: Tue, 18 Sep 2007 02:38:10 +0000 Subject: [PATCH] RemoveAvatar called from scene.cs; implemented in ODE. Still issues with multi-region; see bug 410 --- OpenSim/Region/Environment/Scenes/Scene.cs | 4 ++++ OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index f69aabf7c8..09992fddc9 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -825,6 +825,10 @@ namespace OpenSim.Region.Environment.Scenes { presence.CoarseLocationChange(avatar); presence.ControllingClient.SendKillObject(avatar.RegionHandle, avatar.LocalId); + if (presence.PhysActor != null) + { + phyScene.RemoveAvatar(presence.PhysActor); + } }); lock (Avatars) diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index a6834d47f4..8b49f70c98 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -152,6 +152,9 @@ namespace OpenSim.Region.Physics.OdePlugin public override void RemoveAvatar(PhysicsActor actor) { + OdeCharacter och = (OdeCharacter)actor; + d.BodyDestroy(och.BoundingCapsule); + _characters.Remove(och); } public override void RemovePrim(PhysicsActor prim) @@ -278,7 +281,7 @@ namespace OpenSim.Region.Physics.OdePlugin private PhysicsVector _acceleration; private bool flying = false; //private float gravityAccel; - private IntPtr BoundingCapsule; + public IntPtr BoundingCapsule; private OdeScene _parent_scene; public IntPtr capsule_geom; public d.Mass capsule_mass;