diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Environment/Scenes/AvatarAnimations.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AvatarAnimations.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs index fe9c8e7..6bb5525 100644 --- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs +++ b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs | |||
@@ -27,18 +27,18 @@ | |||
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Xml; | 29 | using System.Xml; |
30 | using libsecondlife; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Scenes | 32 | namespace OpenSim.Region.Environment.Scenes |
33 | { | 33 | { |
34 | public class AvatarAnimations | 34 | public class AvatarAnimations |
35 | { | 35 | { |
36 | public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>(); | 36 | public Dictionary<string, UUID> AnimsUUID = new Dictionary<string, UUID>(); |
37 | public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>(); | 37 | public Dictionary<UUID, string> AnimsNames = new Dictionary<UUID, string>(); |
38 | 38 | ||
39 | public AvatarAnimations() | 39 | public AvatarAnimations() |
40 | { | 40 | { |
41 | using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml")) | 41 | using (XmlTextReader reader = new XmlTextReader("data/avataranimations.Xml")) |
42 | { | 42 | { |
43 | XmlDocument doc = new XmlDocument(); | 43 | XmlDocument doc = new XmlDocument(); |
44 | doc.Load(reader); | 44 | doc.Load(reader); |
@@ -47,9 +47,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
47 | if (nod.Attributes["name"] != null) | 47 | if (nod.Attributes["name"] != null) |
48 | { | 48 | { |
49 | string name = (string)nod.Attributes["name"].Value; | 49 | string name = (string)nod.Attributes["name"].Value; |
50 | LLUUID id = (LLUUID)nod.InnerText; | 50 | UUID id = (UUID)nod.InnerText; |
51 | 51 | ||
52 | AnimsLLUUID.Add(name, id); | 52 | AnimsUUID.Add(name, id); |
53 | AnimsNames.Add(id, name); | 53 | AnimsNames.Add(id, name); |
54 | } | 54 | } |
55 | } | 55 | } |