* Apply second patch in http://opensimulator.org/mantis/view.php?id=2561

* Inserts proper animation state names into data/avataranimations.xml file so that llGetAnimation() works as one would expect.
* Thanks StrawberryFride!

1 files changed, 5 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
index 5417c8d..d4dd0db 100644
--- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
+++ b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
@@ -35,6 +35,7 @@ namespace OpenSim.Region.Environment.Scenes
     {
         public Dictionary<string, UUID> AnimsUUID = new Dictionary<string, UUID>();
         public Dictionary<UUID, string> AnimsNames = new Dictionary<UUID, string>();
+        public Dictionary<UUID, string> AnimStateNames = new Dictionary<UUID, string>();
 
         public AvatarAnimations()
         {
@@ -46,11 +47,14 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     if (nod.Attributes["name"] != null)
                     {
-                        string name = (string)nod.Attributes["name"].Value;
+                        string name = (string)nod.Attributes["name"].Value;                        
                         UUID id = (UUID)nod.InnerText;
+                        string animState = (string)nod.Attributes["state"].Value;
 
                         AnimsUUID.Add(name, id);
                         AnimsNames.Add(id, name);
+                        if (animState != "")
+                            AnimStateNames.Add(id, animState);
                     }
                 }
             }