RemoveAvatar called from scene.cs; implemented in ODE. Still issues with multi-region; see bug 410

2 files changed, 8 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index f69aabf..09992fd 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 a6834d4..8b49f70 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;