1 files changed, 74 insertions, 74 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index d1f75ed..e88ee71 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -1,74 +1,74 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Xml;
+using System.Xml;
-using libsecondlife;
+using libsecondlife;
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Environment.Scenes
-{
+{
-    partial class ScenePresence
+    partial class ScenePresence
-    {
+    {
-        public class AvatarAnimations
+        public class AvatarAnimations
-        {
+        {
-            public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
+            public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
-            public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
+            public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
-            public AvatarAnimations()
+            public AvatarAnimations()
-            {
+            {
-            }
+            }
-            public void LoadAnims()
+            public void LoadAnims()
-            {
+            {
-                //OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
+                //OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
-                XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
+                XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
-                XmlDocument doc = new XmlDocument();
+                XmlDocument doc = new XmlDocument();
-                doc.Load(reader);
+                doc.Load(reader);
-                foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
+                foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
-                {
+                {
-                    if (nod.Attributes["name"] != null)
+                    if (nod.Attributes["name"] != null)
-                    {
+                    {
-                        AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
+                        AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
-                    }
+                    }
-                }
+                }
-                reader.Close();
+                reader.Close();
-                // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
+                // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
-                foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID)
+                foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID)
-                {
+                {
-                    AnimsNames.Add(kp.Value, kp.Key);
+                    AnimsNames.Add(kp.Value, kp.Key);
-                }
+                }
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs index d1f75ed..e88ee71 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -1,74 +1,74 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://www.openmetaverse.org/	2	* Copyright (c) Contributors, http://www.openmetaverse.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
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 libsecondlife;
31		31
32	namespace OpenSim.Region.Environment.Scenes	32	namespace OpenSim.Region.Environment.Scenes
33	{	33	{
34	partial class ScenePresence	34	partial class ScenePresence
35	{	35	{
36	public class AvatarAnimations	36	public class AvatarAnimations
37	{	37	{
38		38
39	public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();	39	public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
40	public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();	40	public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
41		41
42	public AvatarAnimations()	42	public AvatarAnimations()
43	{	43	{
44	}	44	}
45		45
46	public void LoadAnims()	46	public void LoadAnims()
47	{	47	{
48	//OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");	48	//OpenSim.Framework.Console.MainLog.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();
52	doc.Load(reader);	52	doc.Load(reader);
53	foreach (XmlNode nod in doc.DocumentElement.ChildNodes)	53	foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
54	{	54	{
55		55
56	if (nod.Attributes["name"] != null)	56	if (nod.Attributes["name"] != null)
57	{	57	{
58	AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);	58	AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
59	}	59	}
60		60
61	}	61	}
62		62
63	reader.Close();	63	reader.Close();
64		64
65	// OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");	65	// OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
66		66
67	foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID)	67	foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID)
68	{	68	{
69	AnimsNames.Add(kp.Value, kp.Key);	69	AnimsNames.Add(kp.Value, kp.Key);
70	}	70	}
71	}	71	}
72	}	72	}
73	}	73	}
74	}	74	}