aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2007-06-08 16:01:15 +0000
committerMW2007-06-08 16:01:15 +0000
commit31dacf6c763742363655367fd4e1f9d298daf1e0 (patch)
treeb7cade16130fb28645e3d50a6bf1837a87fb3af2 /OpenSim
parent*Added libraries to bin (diff)
downloadopensim-SC-31dacf6c763742363655367fd4e1f9d298daf1e0.zip
opensim-SC-31dacf6c763742363655367fd4e1f9d298daf1e0.tar.gz
opensim-SC-31dacf6c763742363655367fd4e1f9d298daf1e0.tar.bz2
opensim-SC-31dacf6c763742363655367fd4e1f9d298daf1e0.tar.xz
Added prebuild.exe and fixed a couple of namespace problems in AvatarAnimations.cs.
Now need to update prebuild.xml
Diffstat (limited to '')
-rw-r--r--OpenSim/OpenSim.World/AvatarAnimations.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/OpenSim.World/AvatarAnimations.cs b/OpenSim/OpenSim.World/AvatarAnimations.cs
index c7557dc..f13646d 100644
--- a/OpenSim/OpenSim.World/AvatarAnimations.cs
+++ b/OpenSim/OpenSim.World/AvatarAnimations.cs
@@ -31,7 +31,7 @@ using System.Text;
31using libsecondlife; 31using libsecondlife;
32using System.Xml; 32using System.Xml;
33 33
34namespace OpenSim.RegionServer.Simulator 34namespace OpenSim
35{ 35{
36 public class AvatarAnimations 36 public class AvatarAnimations
37 { 37 {
@@ -45,7 +45,7 @@ namespace OpenSim.RegionServer.Simulator
45 45
46 public void LoadAnims() 46 public void LoadAnims()
47 { 47 {
48 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations"); 48 //OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
49 XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"); 49 XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
50 50
51 XmlDocument doc = new XmlDocument(); 51 XmlDocument doc = new XmlDocument();
@@ -62,9 +62,9 @@ namespace OpenSim.RegionServer.Simulator
62 62
63 reader.Close(); 63 reader.Close();
64 64
65 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); 65 // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
66 66
67 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.RegionServer.Simulator.Avatar.Animations.AnimsLLUUID) 67 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.world.Avatar.Animations.AnimsLLUUID)
68 { 68 {
69 AnimsNames.Add(kp.Value, kp.Key); 69 AnimsNames.Add(kp.Value, kp.Key);
70 } 70 }