From d02d925c8610aaf19b332e146bc8f052be0bd65d Mon Sep 17 00:00:00 2001
From: MW <Michaelwri22@yahoo.co.uk>
Date: Tue, 12 Jun 2007 15:10:05 +0000
Subject: [PATCH] did I say I was doing some rearranging?

---
 OpenSim/OpenSim.Region/OpenSim.Region.csproj  |  6 +-
 .../OpenSim.Region/OpenSim.Region.dll.build   |  2 +-
 ...atarAnimations.cs => Avatar.Animations.cs} | 57 ++++++++++---------
 3 files changed, 34 insertions(+), 31 deletions(-)
 rename OpenSim/OpenSim.Region/World/Entities/Avatar/{AvatarAnimations.cs => Avatar.Animations.cs} (58%)

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 897f70fee7..a2b50f4489 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -157,15 +157,15 @@
     <Compile Include="World\Entities\SceneObject.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="World\Entities\Avatar\Avatar.Animations.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="World\Entities\Avatar\Avatar.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="World\Entities\Avatar\Avatar.Update.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="World\Entities\Avatar\AvatarAnimations.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="World\scripting\IScriptContext.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index bcfaaa7188..e87c029a3b 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -20,9 +20,9 @@
                 <include name="World/Entities/Entity.cs" />
                 <include name="World/Entities/Primitive.cs" />
                 <include name="World/Entities/SceneObject.cs" />
+                <include name="World/Entities/Avatar/Avatar.Animations.cs" />
                 <include name="World/Entities/Avatar/Avatar.cs" />
                 <include name="World/Entities/Avatar/Avatar.Update.cs" />
-                <include name="World/Entities/Avatar/AvatarAnimations.cs" />
                 <include name="World/scripting/IScriptContext.cs" />
                 <include name="World/scripting/IScriptEntity.cs" />
                 <include name="World/scripting/IScriptHandler.cs" />
diff --git a/OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Animations.cs
similarity index 58%
rename from OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs
rename to OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Animations.cs
index 585cf3cfa5..5f24cd4a7d 100644
--- a/OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Animations.cs
@@ -33,40 +33,43 @@ using System.Xml;
 
 namespace OpenSim.Region
 {
-    public class AvatarAnimations
+    partial class Avatar
     {
-
-        public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
-        public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
-        
-        public AvatarAnimations()
+        public class AvatarAnimations
         {
-        }
 
-        public void LoadAnims()
-        {
-            //OpenSim.Framework.Console.MainConsole.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)
+            public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
+            public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
+
+            public AvatarAnimations()
             {
-               
-                if ( nod.Attributes["name"] != null)
-                {
-                    AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
-                }
-                
             }
 
-            reader.Close();
-
-           // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
-
-            foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID)
+            public void LoadAnims()
             {
-                AnimsNames.Add(kp.Value, kp.Key);
+                //OpenSim.Framework.Console.MainConsole.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)
+                {
+
+                    if (nod.Attributes["name"] != null)
+                    {
+                        AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
+                    }
+
+                }
+
+                reader.Close();
+
+                // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
+
+                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID)
+                {
+                    AnimsNames.Add(kp.Value, kp.Key);
+                }
             }
         }
     }