* Continued work on Region layer

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

1 files changed, 17 insertions, 9 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index e8f29c8..168a60e 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -45,20 +45,19 @@ 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");
-
-                XmlDocument doc = new XmlDocument();
-                doc.Load(reader);
-                foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
+                using( XmlTextReader reader = new XmlTextReader("data/avataranimations.xml") )
                 {
-                    if (nod.Attributes["name"] != null)
+                    XmlDocument doc = new XmlDocument();
+                    doc.Load(reader);
+                    foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
                     {
-                        AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
+                        if (nod.Attributes["name"] != null)
+                        {
+                            AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
+                        }
                     }
                 }
 
-                reader.Close();
-
                 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
 
                 foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID)
@@ -67,5 +66,14 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
         }
+
+        internal void Close()
+        {
+            if (m_physicsActor != null)
+            {
+                m_scene.PhysScene.RemoveAvatar( PhysicsActor );
+                m_physicsActor = null;
+            }
+        }
     }
 }
\ No newline at end of file