aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-05 15:26:10 +0000
committerJustin Clarke Casey2008-11-05 15:26:10 +0000
commit8f3c5dbe5c072b540ae446ddf57bf654c9f135d6 (patch)
tree0cd1befb3233ce59fc38398002e5cec5995b3451 /OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
parentUpdate svn properties, minor formatting cleanup. (diff)
downloadopensim-SC_OLD-8f3c5dbe5c072b540ae446ddf57bf654c9f135d6.zip
opensim-SC_OLD-8f3c5dbe5c072b540ae446ddf57bf654c9f135d6.tar.gz
opensim-SC_OLD-8f3c5dbe5c072b540ae446ddf57bf654c9f135d6.tar.bz2
opensim-SC_OLD-8f3c5dbe5c072b540ae446ddf57bf654c9f135d6.tar.xz
* 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!
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/AvatarAnimations.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/AvatarAnimations.cs6
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
35 { 35 {
36 public Dictionary<string, UUID> AnimsUUID = new Dictionary<string, UUID>(); 36 public Dictionary<string, UUID> AnimsUUID = new Dictionary<string, UUID>();
37 public Dictionary<UUID, string> AnimsNames = new Dictionary<UUID, string>(); 37 public Dictionary<UUID, string> AnimsNames = new Dictionary<UUID, string>();
38 public Dictionary<UUID, string> AnimStateNames = new Dictionary<UUID, string>();
38 39
39 public AvatarAnimations() 40 public AvatarAnimations()
40 { 41 {
@@ -46,11 +47,14 @@ namespace OpenSim.Region.Environment.Scenes
46 { 47 {
47 if (nod.Attributes["name"] != null) 48 if (nod.Attributes["name"] != null)
48 { 49 {
49 string name = (string)nod.Attributes["name"].Value; 50 string name = (string)nod.Attributes["name"].Value;
50 UUID id = (UUID)nod.InnerText; 51 UUID id = (UUID)nod.InnerText;
52 string animState = (string)nod.Attributes["state"].Value;
51 53
52 AnimsUUID.Add(name, id); 54 AnimsUUID.Add(name, id);
53 AnimsNames.Add(id, name); 55 AnimsNames.Add(id, name);
56 if (animState != "")
57 AnimStateNames.Add(id, animState);
54 } 58 }
55 } 59 }
56 } 60 }