did I say I was doing some rearranging?

3 files changed, 32 insertions, 29 deletions

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 897f70f..a2b50f4 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -157,13 +157,13 @@
     <Compile Include="World\Entities\SceneObject.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\Entities\Avatar\Avatar.cs">

+    <Compile Include="World\Entities\Avatar\Avatar.Animations.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\Entities\Avatar\Avatar.Update.cs">

+    <Compile Include="World\Entities\Avatar\Avatar.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\Entities\Avatar\AvatarAnimations.cs">

+    <Compile Include="World\Entities\Avatar\Avatar.Update.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="World\scripting\IScriptContext.cs">

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index bcfaaa7..e87c029 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
index 585cf3c..5f24cd4 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()

+            {

+            }

+

+            public void LoadAnims()

             {

-               

-                if ( nod.Attributes["name"] != null)

+                //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)

                 {

-                    AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);

+

+                    if (nod.Attributes["name"] != null)

+                    {

+                        AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);

+                    }

+

                 }

-                

-            }

 

-            reader.Close();

+                reader.Close();

 

-           // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");

+                // 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);

+                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID)

+                {

+                    AnimsNames.Add(kp.Value, kp.Key);

+                }

             }

         }

     }