aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-06-12 15:10:05 +0000
committerMW2007-06-12 15:10:05 +0000
commitd02d925c8610aaf19b332e146bc8f052be0bd65d (patch)
treec65a02c0cdb861c4f37cd249b61b478fd7d31e84
parentAnd some more! (diff)
downloadopensim-SC-d02d925c8610aaf19b332e146bc8f052be0bd65d.zip
opensim-SC-d02d925c8610aaf19b332e146bc8f052be0bd65d.tar.gz
opensim-SC-d02d925c8610aaf19b332e146bc8f052be0bd65d.tar.bz2
opensim-SC-d02d925c8610aaf19b332e146bc8f052be0bd65d.tar.xz
did I say I was doing some rearranging?
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.csproj6
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.dll.build2
-rw-r--r--OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Animations.cs (renamed from OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs)53
3 files changed, 32 insertions, 29 deletions
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 897f70f..a2b50f4 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -157,13 +157,13 @@
157 <Compile Include="World\Entities\SceneObject.cs"> 157 <Compile Include="World\Entities\SceneObject.cs">
158 <SubType>Code</SubType> 158 <SubType>Code</SubType>
159 </Compile> 159 </Compile>
160 <Compile Include="World\Entities\Avatar\Avatar.cs"> 160 <Compile Include="World\Entities\Avatar\Avatar.Animations.cs">
161 <SubType>Code</SubType> 161 <SubType>Code</SubType>
162 </Compile> 162 </Compile>
163 <Compile Include="World\Entities\Avatar\Avatar.Update.cs"> 163 <Compile Include="World\Entities\Avatar\Avatar.cs">
164 <SubType>Code</SubType> 164 <SubType>Code</SubType>
165 </Compile> 165 </Compile>
166 <Compile Include="World\Entities\Avatar\AvatarAnimations.cs"> 166 <Compile Include="World\Entities\Avatar\Avatar.Update.cs">
167 <SubType>Code</SubType> 167 <SubType>Code</SubType>
168 </Compile> 168 </Compile>
169 <Compile Include="World\scripting\IScriptContext.cs"> 169 <Compile Include="World\scripting\IScriptContext.cs">
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index bcfaaa7..e87c029 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -20,9 +20,9 @@
20 <include name="World/Entities/Entity.cs" /> 20 <include name="World/Entities/Entity.cs" />
21 <include name="World/Entities/Primitive.cs" /> 21 <include name="World/Entities/Primitive.cs" />
22 <include name="World/Entities/SceneObject.cs" /> 22 <include name="World/Entities/SceneObject.cs" />
23 <include name="World/Entities/Avatar/Avatar.Animations.cs" />
23 <include name="World/Entities/Avatar/Avatar.cs" /> 24 <include name="World/Entities/Avatar/Avatar.cs" />
24 <include name="World/Entities/Avatar/Avatar.Update.cs" /> 25 <include name="World/Entities/Avatar/Avatar.Update.cs" />
25 <include name="World/Entities/Avatar/AvatarAnimations.cs" />
26 <include name="World/scripting/IScriptContext.cs" /> 26 <include name="World/scripting/IScriptContext.cs" />
27 <include name="World/scripting/IScriptEntity.cs" /> 27 <include name="World/scripting/IScriptEntity.cs" />
28 <include name="World/scripting/IScriptHandler.cs" /> 28 <include name="World/scripting/IScriptHandler.cs" />
diff --git a/OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Animations.cs
index 585cf3c..5f24cd4 100644
--- a/OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Animations.cs
@@ -33,40 +33,43 @@ using System.Xml;
33 33
34namespace OpenSim.Region 34namespace OpenSim.Region
35{ 35{
36 public class AvatarAnimations 36 partial class Avatar
37 { 37 {
38 38 public class AvatarAnimations
39 public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
40 public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
41
42 public AvatarAnimations()
43 { 39 {
44 }
45 40
46 public void LoadAnims() 41 public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
47 { 42 public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
48 //OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations"); 43
49 XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"); 44 public AvatarAnimations()
50 45 {
51 XmlDocument doc = new XmlDocument(); 46 }
52 doc.Load(reader); 47
53 foreach (XmlNode nod in doc.DocumentElement.ChildNodes) 48 public void LoadAnims()
54 { 49 {
55 50 //OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
56 if ( nod.Attributes["name"] != null) 51 XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
52
53 XmlDocument doc = new XmlDocument();
54 doc.Load(reader);
55 foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
57 { 56 {
58 AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText); 57
58 if (nod.Attributes["name"] != null)
59 {
60 AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
61 }
62
59 } 63 }
60
61 }
62 64
63 reader.Close(); 65 reader.Close();
64 66
65 // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); 67 // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
66 68
67 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID) 69 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID)
68 { 70 {
69 AnimsNames.Add(kp.Value, kp.Key); 71 AnimsNames.Add(kp.Value, kp.Key);
72 }
70 } 73 }
71 } 74 }
72 } 75 }