1 files changed, 94 insertions, 94 deletions
diff --git a/OpenSim/Framework/Animation.cs b/OpenSim/Framework/Animation.cs
index cda8387..6cfedda 100644
--- a/OpenSim/Framework/Animation.cs
+++ b/OpenSim/Framework/Animation.cs
@@ -1,94 +1,94 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.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;
+using System;
-using OpenMetaverse;
+using OpenMetaverse;
-using OpenMetaverse.StructuredData;
+using OpenMetaverse.StructuredData;
-namespace OpenSim.Framework
+namespace OpenSim.Framework
-{
+{
-    [Serializable]
+    [Serializable]
-    public class Animation
+    public class Animation
-    {
+    {
-        private UUID animID;
+        private UUID animID;
-        public UUID AnimID
+        public UUID AnimID
-        {
+        {
-            get { return animID; }
+            get { return animID; }
-            set { animID = value; }
+            set { animID = value; }
-        }
+        }
-        private int sequenceNum;
+        private int sequenceNum;
-        public int SequenceNum
+        public int SequenceNum
-        {
+        {
-            get { return sequenceNum; }
+            get { return sequenceNum; }
-            set { sequenceNum = value; }
+            set { sequenceNum = value; }
-        }
+        }
-        private UUID objectID;
+        private UUID objectID;
-        public UUID ObjectID
+        public UUID ObjectID
-        {
+        {
-            get { return objectID; }
+            get { return objectID; }
-            set { objectID = value; }
+            set { objectID = value; }
-        }
+        }
-        public Animation()
+        public Animation()
-        {
+        {
-        }
+        }
-        public Animation(UUID animID, int sequenceNum, UUID objectID)
+        public Animation(UUID animID, int sequenceNum, UUID objectID)
-        {
+        {
-            this.animID = animID;
+            this.animID = animID;
-            this.sequenceNum = sequenceNum;
+            this.sequenceNum = sequenceNum;
-            this.objectID = objectID;
+            this.objectID = objectID;
-        }
+        }
-        public Animation(OSDMap args)
+        public Animation(OSDMap args)
-        {
+        {
-            UnpackUpdateMessage(args);
+            UnpackUpdateMessage(args);
-        }
+        }
-        public OSDMap PackUpdateMessage()
+        public OSDMap PackUpdateMessage()
-        {
+        {
-            OSDMap anim = new OSDMap();
+            OSDMap anim = new OSDMap();
-            anim["animation"] = OSD.FromUUID(animID);
+            anim["animation"] = OSD.FromUUID(animID);
-            anim["object_id"] = OSD.FromUUID(objectID);
+            anim["object_id"] = OSD.FromUUID(objectID);
-            anim["seq_num"] = OSD.FromInteger(sequenceNum);
+            anim["seq_num"] = OSD.FromInteger(sequenceNum);
-            return anim;
+            return anim;
-        }
+        }
-        public void UnpackUpdateMessage(OSDMap args)
+        public void UnpackUpdateMessage(OSDMap args)
-        {
+        {
-            if (args["animation"] != null)
+            if (args["animation"] != null)
-                animID = args["animation"].AsUUID();
+                animID = args["animation"].AsUUID();
-            if (args["object_id"] != null)
+            if (args["object_id"] != null)
-                objectID = args["object_id"].AsUUID();
+                objectID = args["object_id"].AsUUID();
-            if (args["seq_num"] != null)
+            if (args["seq_num"] != null)
-                sequenceNum = args["seq_num"].AsInteger();
+                sequenceNum = args["seq_num"].AsInteger();
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Framework/Animation.cs b/OpenSim/Framework/Animation.cs index cda8387..6cfedda 100644 --- a/OpenSim/Framework/Animation.cs +++ b/OpenSim/Framework/Animation.cs
@@ -1,94 +1,94 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.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;	28	using System;
29	using OpenMetaverse;	29	using OpenMetaverse;
30	using OpenMetaverse.StructuredData;	30	using OpenMetaverse.StructuredData;
31		31
32	namespace OpenSim.Framework	32	namespace OpenSim.Framework
33	{	33	{
34	[Serializable]	34	[Serializable]
35	public class Animation	35	public class Animation
36	{	36	{
37	private UUID animID;	37	private UUID animID;
38	public UUID AnimID	38	public UUID AnimID
39	{	39	{
40	get { return animID; }	40	get { return animID; }
41	set { animID = value; }	41	set { animID = value; }
42	}	42	}
43		43
44	private int sequenceNum;	44	private int sequenceNum;
45	public int SequenceNum	45	public int SequenceNum
46	{	46	{
47	get { return sequenceNum; }	47	get { return sequenceNum; }
48	set { sequenceNum = value; }	48	set { sequenceNum = value; }
49	}	49	}
50		50
51	private UUID objectID;	51	private UUID objectID;
52	public UUID ObjectID	52	public UUID ObjectID
53	{	53	{
54	get { return objectID; }	54	get { return objectID; }
55	set { objectID = value; }	55	set { objectID = value; }
56	}	56	}
57		57
58	public Animation()	58	public Animation()
59	{	59	{
60	}	60	}
61		61
62	public Animation(UUID animID, int sequenceNum, UUID objectID)	62	public Animation(UUID animID, int sequenceNum, UUID objectID)
63	{	63	{
64	this.animID = animID;	64	this.animID = animID;
65	this.sequenceNum = sequenceNum;	65	this.sequenceNum = sequenceNum;
66	this.objectID = objectID;	66	this.objectID = objectID;
67	}	67	}
68		68
69	public Animation(OSDMap args)	69	public Animation(OSDMap args)
70	{	70	{
71	UnpackUpdateMessage(args);	71	UnpackUpdateMessage(args);
72	}	72	}
73		73
74	public OSDMap PackUpdateMessage()	74	public OSDMap PackUpdateMessage()
75	{	75	{
76	OSDMap anim = new OSDMap();	76	OSDMap anim = new OSDMap();
77	anim["animation"] = OSD.FromUUID(animID);	77	anim["animation"] = OSD.FromUUID(animID);
78	anim["object_id"] = OSD.FromUUID(objectID);	78	anim["object_id"] = OSD.FromUUID(objectID);
79	anim["seq_num"] = OSD.FromInteger(sequenceNum);	79	anim["seq_num"] = OSD.FromInteger(sequenceNum);
80	return anim;	80	return anim;
81	}	81	}
82		82
83	public void UnpackUpdateMessage(OSDMap args)	83	public void UnpackUpdateMessage(OSDMap args)
84	{	84	{
85	if (args["animation"] != null)	85	if (args["animation"] != null)
86	animID = args["animation"].AsUUID();	86	animID = args["animation"].AsUUID();
87	if (args["object_id"] != null)	87	if (args["object_id"] != null)
88	objectID = args["object_id"].AsUUID();	88	objectID = args["object_id"].AsUUID();
89	if (args["seq_num"] != null)	89	if (args["seq_num"] != null)
90	sequenceNum = args["seq_num"].AsInteger();	90	sequenceNum = args["seq_num"].AsInteger();
91	}	91	}
92		92
93	}	93	}
94	}	94	}