Instead of loading default avatar animations in both SLUtil and AvatarAnimations, load just in AvatarAnimations instead.

This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST.
This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND")
but scripts refer to them with lowercase names (e.g. "sit").

2 files changed, 2 insertions, 51 deletions

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index c85e599..3f560d0 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1215,10 +1215,9 @@ namespace OpenSim.Framework
         /// <param name="OrbitalPosition">The orbital position is given in radians, and must be "adjusted" for the linden client, see LLClientView</param>
         void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear,
                         float OrbitalPosition);
-
+        
         void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks);
         void SendViewerTime(int phase);
-        UUID GetDefaultAnimation(string name);
 
         void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, string flAbout,
                                   uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID);
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index f9cb851..db4541e 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
 using System.Xml;
 using log4net;
@@ -40,13 +41,6 @@ namespace OpenSim.Framework
         
         #region SL / file extension / content-type conversions
 
-        public static Dictionary<string, UUID> DefaultAvatarAnimations = new Dictionary<string, UUID>();
-
-        static SLUtil()
-        {
-            DefaultAvatarAnimations = LoadDefaultAvatarAnimations("data/avataranimations.xml");
-        }
-
         public static string SLAssetTypeToContentType(int assetType)
         {
             switch ((AssetType)assetType)
@@ -382,47 +376,5 @@ namespace OpenSim.Framework
             
             return output;
         }
-
-        /// <summary>
-        /// Load the default SL avatar animations.
-        /// </summary>
-        /// <returns></returns>
-        public static Dictionary<string, UUID> LoadDefaultAvatarAnimations(string path)
-        {
-            Dictionary<string, UUID> animations = new Dictionary<string, UUID>();
-            
-            using (XmlTextReader reader = new XmlTextReader(path))
-            {
-                XmlDocument doc = new XmlDocument();
-                doc.Load(reader);
-                if (doc.DocumentElement != null)
-                {
-                    foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
-                    {
-                        if (nod.Attributes["name"] != null)
-                        {
-                            string name = nod.Attributes["name"].Value.ToLower();
-                            string id = nod.InnerText;
-                            animations.Add(name, (UUID)id);
-                        }
-                    }
-                }
-            }
-
-            return animations;
-        }
-
-        /// <summary>
-        /// Get the default SL avatar animation with the given name.
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        public static UUID GetDefaultAvatarAnimation(string name)
-        {
-            if (DefaultAvatarAnimations.ContainsKey(name))
-                return DefaultAvatarAnimations[name];
-
-            return UUID.Zero;
-        }
     }
 }
\ No newline at end of file