Factor out common default animations code into SLUtil. LLClientView now makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy.

As per opensim-users mailing list discussion.

1 files changed, 51 insertions, 1 deletions

diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index b337e03..f9cb851 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Xml;
 using log4net;
 using OpenMetaverse;
 
@@ -39,6 +40,13 @@ 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)
@@ -374,5 +382,47 @@ 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