remove another partial class, and map another class back to a real file

2 files changed, 26 insertions, 27 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
index f016ac2..d508c9e 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
@@ -28,42 +28,41 @@
 using System.Collections.Generic;
 using System.Xml;
 using libsecondlife;
+using libsecondlife.Packets;
+
 
 namespace OpenSim.Region.Environment.Scenes
 {
-    partial class ScenePresence
+    public class AvatarAnimations
     {
-        public class AvatarAnimations
+        public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
+        public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
+        
+        public AvatarAnimations()
         {
-            public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
-            public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
-
-            public AvatarAnimations()
-            {
-            }
-
-            public void LoadAnims()
+        }
+        
+        public void LoadAnims()
+        {
+            //MainLog.Instance.Verbose("CLIENT", "Loading avatar animations");
+            using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
             {
-                //MainLog.Instance.Verbose("CLIENT", "Loading avatar animations");
-                using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
+                XmlDocument doc = new XmlDocument();
+                doc.Load(reader);
+                foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
                 {
-                    XmlDocument doc = new XmlDocument();
-                    doc.Load(reader);
-                    foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
+                    if (nod.Attributes["name"] != null)
                     {
-                        if (nod.Attributes["name"] != null)
-                        {
-                            AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
-                        }
+                        AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
                     }
                 }
-
-                // MainLog.Instance.Verbose("CLIENT", "Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
-
-                foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID)
-                {
-                    AnimsNames.Add(kp.Value, kp.Key);
-                }
+            }
+            
+            // MainLog.Instance.Verbose("CLIENT", "Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
+            
+            foreach (KeyValuePair<string, LLUUID> kp in ScenePresence.Animations.AnimsLLUUID)
+            {
+                AnimsNames.Add(kp.Value, kp.Key);
             }
         }
     }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 0640067..512eed0 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -38,7 +38,7 @@ using OpenSim.Region.Physics.Manager;
 
 namespace OpenSim.Region.Environment.Scenes
 {
-    public partial class ScenePresence : EntityBase
+    public class ScenePresence : EntityBase
     {
         public static AvatarAnimations Animations;
         public static byte[] DefaultTexture;