* Continued work on Region layer

* Added Close() to ScenePresence to remove and destroy PhysicsActor

OpenSim/Region/Environment/EstateManager.cs

@@ -341,10 +341,9 @@ namespace OpenSim.Region.Environment
 
         public void sendRegionHandshakeToAll()
         {
-            m_scene.ForEachScenePresence( delegate( ScenePresence scenePresence )
+            m_scene.Broadcast(
-            {
+                sendRegionHandshake
-                sendRegionHandshake(scenePresence.ControllingClient);
+            );
-            });
         }
 
         public void sendRegionInfoPacket(IClientAPI remote_client)

OpenSim/Region/Environment/Regions/Region.cs

@@ -40,5 +40,10 @@ namespace OpenSim.Region.Environment.Regions
                 whatToDo(subscription.Client);                
             }
         }
+
+        internal void Remove(LLUUID agentID)
+        {
+            // TODO : Well, remove it!
+        }
     }
 }

OpenSim/Region/Environment/Scenes/Scene.cs

@@ -641,6 +641,7 @@ namespace OpenSim.Region.Environment.Scenes
         public override void AddNewClient(IClientAPI client, bool child)
         {
             SubscribeToClientEvents(client);
+
             m_estateManager.sendRegionHandshake(client);
 
             CreateAndAddScenePresence(client, child);
@@ -769,33 +770,34 @@ namespace OpenSim.Region.Environment.Scenes
 
             ScenePresence avatar = GetScenePresence(agentID);
 
+            Broadcast(delegate(IClientAPI client)
+                           {
+                               client.SendKillObject(avatar.RegionHandle, avatar.LocalId);
+                           });
+
+
             ForEachScenePresence(
                 delegate(ScenePresence presence)
                 {
-                    presence.CoarseLocationChange(avatar);
+                    presence.CoarseLocationChange();
-                    presence.ControllingClient.SendKillObject(avatar.RegionHandle, avatar.LocalId);
-                    if (presence.PhysicsActor != null)
-                    {
-                        phyScene.RemoveAvatar(presence.PhysicsActor);
-                        presence.PhysicsActor = null;
-                    }
                 });
 
             lock (m_scenePresences)
-            {
-                if (m_scenePresences.ContainsKey(agentID))
             {
                 m_scenePresences.Remove(agentID);
             }
-            }
+
-            lock (Entities)
+            lock (m_region)
             {
-                if (Entities.ContainsKey(agentID))
+                m_region.Remove(agentID);
+            }
+
+            lock (Entities)
             {
                 Entities.Remove(agentID);
             }
-            }
+
-            // TODO: Add the removal from physics ?
+            avatar.Close();
 
             // Remove client agent from profile, so new logins will work
             commsManager.UserServer.clearUserAgent(agentID);

OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs

@@ -45,8 +45,8 @@ namespace OpenSim.Region.Environment.Scenes
             public void LoadAnims()
             {
                 //OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
-                XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
+                using( XmlTextReader reader = new XmlTextReader("data/avataranimations.xml") )
-
+                {
                     XmlDocument doc = new XmlDocument();
                     doc.Load(reader);
                     foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
@@ -56,8 +56,7 @@ namespace OpenSim.Region.Environment.Scenes
                             AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
                         }
                     }
-
+                }
-                reader.Close();
 
                 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
 
@@ -67,5 +66,14 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
         }
+
+        internal void Close()
+        {
+            if (m_physicsActor != null)
+            {
+                m_scene.PhysScene.RemoveAvatar( PhysicsActor );
+                m_physicsActor = null;
+            }
+        }
     }
 }

OpenSim/Region/Environment/Scenes/ScenePresence.cs

@@ -627,7 +627,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_controllingClient.SendCoarseLocationUpdate(CoarseLocations);
         }
 
-        public void CoarseLocationChange(ScenePresence avatar)
+        public void CoarseLocationChange()
         {
             newCoarseLocations = true;
         }
@@ -638,7 +638,7 @@ namespace OpenSim.Region.Environment.Scenes
                                              {
                                                  if (presence != this)
                                                  {
-                                                     presence.CoarseLocationChange(this);
+                                                     presence.CoarseLocationChange();
                                                  }
                                              });
         }