Merge branch 'master' of ssh://MyConnection/var/git/opensim

3 files changed, 732 insertions, 0 deletions

diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
new file mode 100644
index 0000000..0bf8f64
--- /dev/null
+++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
@@ -0,0 +1,339 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using NUnit.Framework;
+
+
+namespace OpenSim.Framework.Tests
+{
+    [TestFixture]
+    public class AgentCircuitDataTest
+    {
+        private UUID AgentId;
+        private AvatarAppearance AvAppearance;
+        private byte[] VisualParams;
+        private UUID BaseFolder;
+        private string CapsPath;
+        private Dictionary<ulong, string> ChildrenCapsPaths;
+        private uint circuitcode = 0949030;
+        private string firstname;
+        private string lastname;
+        private UUID SecureSessionId;
+        private UUID SessionId;
+        private Vector3 StartPos;
+
+
+        [SetUp]
+        public void setup()
+        {
+            AgentId = UUID.Random();
+            BaseFolder = UUID.Random();
+            CapsPath = "http://www.opensimulator.org/Caps/Foo";
+            ChildrenCapsPaths = new Dictionary<ulong, string>();
+            ChildrenCapsPaths.Add(ulong.MaxValue, "http://www.opensimulator.org/Caps/Foo2");
+            firstname = "CoolAvatarTest";
+            lastname = "test";
+            StartPos = new Vector3(5,23,125);
+
+            SecureSessionId = UUID.Random();
+            SessionId = UUID.Random();
+
+            AvAppearance = new AvatarAppearance(AgentId);
+            AvAppearance.SetDefaultWearables();
+            VisualParams = new byte[218];
+            AvAppearance.SetDefaultParams(VisualParams);
+
+            //body
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HEIGHT] = 155;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_THICKNESS] = 00;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BODY_FAT] = 0;
+
+            //Torso
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_TORSO_MUSCLES] = 48;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_NECK_THICKNESS] = 43;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_NECK_LENGTH] = 255;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_SHOULDERS] = 94;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_CHEST_MALE_NO_PECS] = 199;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_ARM_LENGTH] = 255;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HAND_SIZE] = 33;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_TORSO_LENGTH] = 240;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_LOVE_HANDLES] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BELLY_SIZE] = 0;
+
+            // legs
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_LEG_MUSCLES] = 82;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_LEG_LENGTH] = 255;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HIP_WIDTH] = 84;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HIP_LENGTH] = 166;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BUTT_SIZE] = 64;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_SADDLEBAGS] = 89;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BOWED_LEGS] = 127;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_FOOT_SIZE] = 45;
+
+
+            // head 
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HEAD_SIZE] = 255;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_SQUASH_STRETCH_HEAD] = 0; // head stretch
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HEAD_SHAPE] = 155;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_EGG_HEAD] = 127;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_POINTY_EARS] = 255;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HEAD_LENGTH] = 45;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_FACE_SHEAR] = 127;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_FOREHEAD_ANGLE] = 104;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BIG_BROW] = 94;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_PUFFY_UPPER_CHEEKS] = 0; //  upper cheeks 
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_DOUBLE_CHIN] = 122; //  lower cheeks
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HIGH_CHEEK_BONES] = 130;
+
+
+
+            // eyes
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_EYE_SIZE] = 105;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_WIDE_EYES] = 135;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_EYE_SPACING] = 184;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_EYELID_CORNER_UP] = 230;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_EYELID_INNER_CORNER_UP] = 120;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_EYE_DEPTH] = 158;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_UPPER_EYELID_FOLD] = 69;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BAGGY_EYES] = 38;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_EYELASHES_LONG] = 127;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_POP_EYE] = 127;
+
+            VisualParams[(int)AvatarAppearance.VPElement.EYES_EYE_COLOR] = 25;
+            VisualParams[(int)AvatarAppearance.VPElement.EYES_EYE_LIGHTNESS] = 127;
+
+            // ears
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BIG_EARS] = 255;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_EARS_OUT] = 127;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_ATTACHED_EARLOBES] = 127;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_POINTY_EARS] = 255;
+
+            // nose
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_NOSE_BIG_OUT] = 79;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_WIDE_NOSE] = 35;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BROAD_NOSTRILS] = 86;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_LOW_SEPTUM_NOSE] = 112; // nostril division
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BULBOUS_NOSE] = 25;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_NOBLE_NOSE_BRIDGE] = 25; // upper bridge
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_LOWER_BRIDGE_NOSE] = 25; // lower bridge
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_WIDE_NOSE_BRIDGE] = 25;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_UPTURNED_NOSE_TIP] = 107;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BULBOUS_NOSE_TIP] = 25;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_CROOKED_NOSE] = 127;
+
+
+            // Mouth
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_LIP_WIDTH] = 122;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_TALL_LIPS] = 10; // lip fullness
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_LIP_THICKNESS] = 112;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_LIP_RATIO] = 137;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_MOUTH_HEIGHT] = 176;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_MOUTH_CORNER] = 140; // Sad --> happy
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_LIP_CLEFT_DEEP] = 84;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_WIDE_LIP_CLEFT] = 84;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_SHIFT_MOUTH] = 127;
+
+
+            // chin
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_WEAK_CHIN] = 119;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_SQUARE_JAW] = 5;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_DEEP_CHIN] = 132;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_JAW_ANGLE] = 153;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_JAW_JUT] = 100;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_JOWLS] = 38;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_CLEFT_CHIN] = 89;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_CLEFT_CHIN_UPPER] = 89;
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_DOUBLE_CHIN] = 0;
+
+
+            // hair color
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_WHITE_HAIR] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_RAINBOW_COLOR_39] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_BLONDE_HAIR] = 24;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_RED_HAIR] = 0;
+
+            // hair style
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_VOLUME] = 160;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_FRONT] = 153;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_SIDES] = 153;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_BACK] = 170;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_BIG_FRONT] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_BIG_TOP] = 117;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_BIG_BACK] = 170;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_FRONT_FRINGE] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_SIDE_FRINGE] = 142;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_BACK_FRINGE] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_SIDES_FULL] = 146;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_SWEEP] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_SHEAR_FRONT] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_SHEAR_BACK] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_TAPER_FRONT] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_TAPER_BACK] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_RUMPLED] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_PIGTAILS] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_PONYTAIL] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_SPIKED] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_TILT] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_PART_MIDDLE] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_PART_RIGHT] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_PART_LEFT] = 0;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_BANGS_PART_MIDDLE] = 155;
+
+            //Eyebrows
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_EYEBROW_SIZE] = 20;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_EYEBROW_DENSITY] = 140;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_LOWER_EYEBROWS] = 200; // eyebrow height
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_ARCED_EYEBROWS] = 124;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_POINTY_EYEBROWS] = 65;
+
+            //Facial hair
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_HAIR_THICKNESS] = 65;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_SIDEBURNS] = 235;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_MOUSTACHE] = 75;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_CHIN_CURTAINS] = 140;
+            VisualParams[(int)AvatarAppearance.VPElement.HAIR_SOULPATCH] = 0;
+
+            AvAppearance.VisualParams = VisualParams;
+
+            List<byte> wearbyte = new List<byte>();
+            for (int i = 0; i < VisualParams.Length; i++)
+            {
+                wearbyte.Add(VisualParams[i]);
+            }
+
+
+            AvAppearance.SetAppearance(AvAppearance.Texture.GetBytes(), wearbyte);
+        }
+
+        /// <summary>
+        /// Test to ensure that the serialization format is the same and the underlying types don't change without notice
+        /// oldSerialization is just a json serialization of the OSDMap packed for the AgentCircuitData.
+        /// The idea is that if the current json serializer cannot parse the old serialization, then the underlying types 
+        /// have changed and are incompatible.
+        /// </summary>
+        [Test]
+        public void HistoricalAgentCircuitDataOSDConversion()
+        {
+            string oldSerialization = "{\"agent_id\":\"522675bd-8214-40c1-b3ca-9c7f7fd170be\",\"base_folder\":\"c40b5f5f-476f-496b-bd69-b5a539c434d8\",\"caps_path\":\"http://www.opensimulator.org/Caps/Foo\",\"children_seeds\":[{\"handle\":\"18446744073709551615\",\"seed\":\"http://www.opensimulator.org/Caps/Foo2\"}],\"child\":false,\"circuit_code\":\"949030\",\"first_name\":\"CoolAvatarTest\",\"last_name\":\"test\",\"inventory_folder\":\"c40b5f5f-476f-496b-bd69-b5a539c434d8\",\"secure_session_id\":\"1e608e2b-0ddb-41f6-be0f-926f61cd3e0a\",\"session_id\":\"aa06f798-9d70-4bdb-9bbf-012a02ee2baf\",\"start_pos\":\"<5, 23, 125>\"}";
+            AgentCircuitData Agent1Data = new AgentCircuitData();
+            Agent1Data.AgentID = new UUID("522675bd-8214-40c1-b3ca-9c7f7fd170be");
+            Agent1Data.Appearance = AvAppearance;
+            Agent1Data.BaseFolder = new UUID("c40b5f5f-476f-496b-bd69-b5a539c434d8");
+            Agent1Data.CapsPath = CapsPath;
+            Agent1Data.child = false;
+            Agent1Data.ChildrenCapSeeds = ChildrenCapsPaths;
+            Agent1Data.circuitcode = circuitcode;
+            Agent1Data.firstname = firstname;
+            Agent1Data.InventoryFolder = new UUID("c40b5f5f-476f-496b-bd69-b5a539c434d8");
+            Agent1Data.lastname = lastname;
+            Agent1Data.SecureSessionID = new UUID("1e608e2b-0ddb-41f6-be0f-926f61cd3e0a");
+            Agent1Data.SessionID = new UUID("aa06f798-9d70-4bdb-9bbf-012a02ee2baf");
+            Agent1Data.startpos = StartPos;
+
+            OSDMap map2 = (OSDMap)OSDParser.DeserializeJson(oldSerialization);
+
+
+            AgentCircuitData Agent2Data = new AgentCircuitData();
+            Agent2Data.UnpackAgentCircuitData(map2);
+
+            Assert.That((Agent1Data.AgentID == Agent2Data.AgentID));
+            Assert.That((Agent1Data.BaseFolder == Agent2Data.BaseFolder));
+
+            Assert.That((Agent1Data.CapsPath == Agent2Data.CapsPath));
+            Assert.That((Agent1Data.child == Agent2Data.child));
+            Assert.That((Agent1Data.ChildrenCapSeeds.Count == Agent2Data.ChildrenCapSeeds.Count));
+            Assert.That((Agent1Data.circuitcode == Agent2Data.circuitcode));
+            Assert.That((Agent1Data.firstname == Agent2Data.firstname));
+            Assert.That((Agent1Data.InventoryFolder == Agent2Data.InventoryFolder));
+            Assert.That((Agent1Data.lastname == Agent2Data.lastname));
+            Assert.That((Agent1Data.SecureSessionID == Agent2Data.SecureSessionID));
+            Assert.That((Agent1Data.SessionID == Agent2Data.SessionID));
+            Assert.That((Agent1Data.startpos == Agent2Data.startpos));
+            /*
+            Enable this once VisualParams go in the packing method
+            for (int i=0;i<208;i++)
+               Assert.That((Agent1Data.Appearance.VisualParams[i] == Agent2Data.Appearance.VisualParams[i]));
+            */
+       }
+
+       /// <summary>
+       /// Test to ensure that the packing and unpacking methods work.
+       /// </summary>
+       [Test]
+       public void TestAgentCircuitDataOSDConversion()
+       {
+           AgentCircuitData Agent1Data = new AgentCircuitData();
+           Agent1Data.AgentID = AgentId;
+           Agent1Data.Appearance = AvAppearance;
+           Agent1Data.BaseFolder = BaseFolder;
+           Agent1Data.CapsPath = CapsPath;
+           Agent1Data.child = false;
+           Agent1Data.ChildrenCapSeeds = ChildrenCapsPaths;
+           Agent1Data.circuitcode = circuitcode;
+           Agent1Data.firstname = firstname;
+           Agent1Data.InventoryFolder = BaseFolder;
+           Agent1Data.lastname = lastname;
+           Agent1Data.SecureSessionID = SecureSessionId;
+           Agent1Data.SessionID = SessionId;
+           Agent1Data.startpos = StartPos;
+
+
+           OSDMap map = Agent1Data.PackAgentCircuitData();
+           string str = OSDParser.SerializeJsonString(map);
+           //System.Console.WriteLine(str);
+           OSDMap map2 = (OSDMap)OSDParser.DeserializeJson(str);
+
+
+           AgentCircuitData Agent2Data = new AgentCircuitData();
+           Agent2Data.UnpackAgentCircuitData(map2);
+
+           Assert.That((Agent1Data.AgentID == Agent2Data.AgentID));
+           Assert.That((Agent1Data.BaseFolder == Agent2Data.BaseFolder));
+
+           Assert.That((Agent1Data.CapsPath == Agent2Data.CapsPath));
+           Assert.That((Agent1Data.child == Agent2Data.child));
+           Assert.That((Agent1Data.ChildrenCapSeeds.Count == Agent2Data.ChildrenCapSeeds.Count));
+           Assert.That((Agent1Data.circuitcode == Agent2Data.circuitcode));
+           Assert.That((Agent1Data.firstname == Agent2Data.firstname));
+           Assert.That((Agent1Data.InventoryFolder == Agent2Data.InventoryFolder));
+           Assert.That((Agent1Data.lastname == Agent2Data.lastname));
+           Assert.That((Agent1Data.SecureSessionID == Agent2Data.SecureSessionID));
+           Assert.That((Agent1Data.SessionID == Agent2Data.SessionID));
+           Assert.That((Agent1Data.startpos == Agent2Data.startpos));
+
+           /*
+            Enable this once VisualParams go in the packing method
+           for (int i = 0; i < 208; i++)
+               Assert.That((Agent1Data.Appearance.VisualParams[i] == Agent2Data.Appearance.VisualParams[i]));
+           */
+
+
+        }
+    }
+}
diff --git a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
new file mode 100644
index 0000000..ab5f04a
--- /dev/null
+++ b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System.Collections.Generic;
+using OpenMetaverse;
+using NUnit.Framework;
+using System;
+
+namespace OpenSim.Framework.Tests
+{
+    [TestFixture]
+    public class AgentCircuitManagerTests
+    {
+        private AgentCircuitData m_agentCircuitData1;
+        private AgentCircuitData m_agentCircuitData2;
+        private UUID AgentId1;
+        private UUID AgentId2;
+        private uint circuitcode1;
+        private uint circuitcode2;
+
+        private UUID SessionId1;
+        private UUID SessionId2;
+        private Random rnd = new Random(Environment.TickCount);
+
+        [SetUp]
+        public void setup()
+        {
+
+            AgentId1 = UUID.Random();
+            AgentId2 = UUID.Random();
+            circuitcode1 = (uint) rnd.Next((int)uint.MinValue, int.MaxValue);
+            circuitcode2 = (uint) rnd.Next((int)uint.MinValue, int.MaxValue);
+            SessionId1 = UUID.Random();
+            SessionId2 = UUID.Random();
+            UUID BaseFolder = UUID.Random();
+            string CapsPath = "http://www.opensimulator.org/Caps/Foo";
+            Dictionary<ulong,string> ChildrenCapsPaths = new Dictionary<ulong, string>();
+            ChildrenCapsPaths.Add(ulong.MaxValue, "http://www.opensimulator.org/Caps/Foo2");
+            string firstname = "CoolAvatarTest";
+            string lastname = "test";
+            Vector3 StartPos = new Vector3(5, 23, 125);
+
+            UUID SecureSessionId = UUID.Random();
+            UUID SessionId = UUID.Random();
+
+            m_agentCircuitData1 = new AgentCircuitData();
+            m_agentCircuitData1.AgentID = AgentId1;
+            m_agentCircuitData1.Appearance = new AvatarAppearance(AgentId1);
+            m_agentCircuitData1.BaseFolder = BaseFolder;
+            m_agentCircuitData1.CapsPath = CapsPath;
+            m_agentCircuitData1.child = false;
+            m_agentCircuitData1.ChildrenCapSeeds = ChildrenCapsPaths;
+            m_agentCircuitData1.circuitcode = circuitcode1;
+            m_agentCircuitData1.firstname = firstname;
+            m_agentCircuitData1.InventoryFolder = BaseFolder;
+            m_agentCircuitData1.lastname = lastname;
+            m_agentCircuitData1.SecureSessionID = SecureSessionId;
+            m_agentCircuitData1.SessionID = SessionId1;
+            m_agentCircuitData1.startpos = StartPos;
+
+            m_agentCircuitData2 = new AgentCircuitData();
+            m_agentCircuitData2.AgentID = AgentId2;
+            m_agentCircuitData2.Appearance = new AvatarAppearance(AgentId2);
+            m_agentCircuitData2.BaseFolder = BaseFolder;
+            m_agentCircuitData2.CapsPath = CapsPath;
+            m_agentCircuitData2.child = false;
+            m_agentCircuitData2.ChildrenCapSeeds = ChildrenCapsPaths;
+            m_agentCircuitData2.circuitcode = circuitcode2;
+            m_agentCircuitData2.firstname = firstname;
+            m_agentCircuitData2.InventoryFolder = BaseFolder;
+            m_agentCircuitData2.lastname = lastname;
+            m_agentCircuitData2.SecureSessionID = SecureSessionId;
+            m_agentCircuitData2.SessionID = SessionId2;
+            m_agentCircuitData2.startpos = StartPos;
+        }
+
+        /// <summary>
+        /// Validate that adding the circuit works appropriately
+        /// </summary>
+        [Test]
+        public void AddAgentCircuitTest()
+        {
+            AgentCircuitManager agentCircuitManager = new AgentCircuitManager();
+            agentCircuitManager.AddNewCircuit(circuitcode1,m_agentCircuitData1);
+            agentCircuitManager.AddNewCircuit(circuitcode2, m_agentCircuitData2);
+            AgentCircuitData agent = agentCircuitManager.GetAgentCircuitData(circuitcode1);
+
+            Assert.That((m_agentCircuitData1.AgentID == agent.AgentID));
+            Assert.That((m_agentCircuitData1.BaseFolder == agent.BaseFolder));
+
+            Assert.That((m_agentCircuitData1.CapsPath == agent.CapsPath));
+            Assert.That((m_agentCircuitData1.child == agent.child));
+            Assert.That((m_agentCircuitData1.ChildrenCapSeeds.Count == agent.ChildrenCapSeeds.Count));
+            Assert.That((m_agentCircuitData1.circuitcode == agent.circuitcode));
+            Assert.That((m_agentCircuitData1.firstname == agent.firstname));
+            Assert.That((m_agentCircuitData1.InventoryFolder == agent.InventoryFolder));
+            Assert.That((m_agentCircuitData1.lastname == agent.lastname));
+            Assert.That((m_agentCircuitData1.SecureSessionID == agent.SecureSessionID));
+            Assert.That((m_agentCircuitData1.SessionID == agent.SessionID));
+            Assert.That((m_agentCircuitData1.startpos == agent.startpos));
+        }
+
+        /// <summary>
+        /// Validate that removing the circuit code removes it appropriately
+        /// </summary>
+        [Test]
+        public void RemoveAgentCircuitTest()
+        {
+            AgentCircuitManager agentCircuitManager = new AgentCircuitManager();
+            agentCircuitManager.AddNewCircuit(circuitcode1, m_agentCircuitData1);
+            agentCircuitManager.AddNewCircuit(circuitcode2, m_agentCircuitData2);
+            agentCircuitManager.RemoveCircuit(circuitcode2);
+
+            AgentCircuitData agent = agentCircuitManager.GetAgentCircuitData(circuitcode2);
+            Assert.That(agent == null);
+
+        }
+
+        /// <summary>
+        /// Validate that changing the circuit code works
+        /// </summary>
+        [Test]
+        public void ChangeAgentCircuitCodeTest()
+        {
+            AgentCircuitManager agentCircuitManager = new AgentCircuitManager();
+            agentCircuitManager.AddNewCircuit(circuitcode1, m_agentCircuitData1);
+            agentCircuitManager.AddNewCircuit(circuitcode2, m_agentCircuitData2);
+            bool result = false;
+
+            result = agentCircuitManager.TryChangeCiruitCode(circuitcode1, 393930);
+
+            AgentCircuitData agent = agentCircuitManager.GetAgentCircuitData(393930);
+            AgentCircuitData agent2 = agentCircuitManager.GetAgentCircuitData(circuitcode1);
+            Assert.That(agent != null);
+            Assert.That(agent2 == null);
+            Assert.That(result);
+
+        }
+
+        /// <summary>
+        /// Validates that the login authentication scheme is working
+        /// First one should be authorized
+        /// Rest should not be authorized
+        /// </summary>
+        [Test]
+        public void ValidateLoginTest()
+        {
+            AgentCircuitManager agentCircuitManager = new AgentCircuitManager();
+            agentCircuitManager.AddNewCircuit(circuitcode1, m_agentCircuitData1);
+            agentCircuitManager.AddNewCircuit(circuitcode2, m_agentCircuitData2);
+
+            // should be authorized
+            AuthenticateResponse resp = agentCircuitManager.AuthenticateSession(SessionId1, AgentId1, circuitcode1);
+            Assert.That(resp.Authorised);
+
+
+            //should not be authorized
+            resp = agentCircuitManager.AuthenticateSession(SessionId1, UUID.Random(), circuitcode1);
+            Assert.That(!resp.Authorised);
+
+            resp = agentCircuitManager.AuthenticateSession(UUID.Random(), AgentId1, circuitcode1);
+            Assert.That(!resp.Authorised);
+            
+            resp = agentCircuitManager.AuthenticateSession(SessionId1, AgentId1, circuitcode2);
+            Assert.That(!resp.Authorised);
+
+            resp = agentCircuitManager.AuthenticateSession(SessionId2, AgentId1, circuitcode2);
+            Assert.That(!resp.Authorised);
+
+            agentCircuitManager.RemoveCircuit(circuitcode2);
+
+            resp = agentCircuitManager.AuthenticateSession(SessionId2, AgentId2, circuitcode2);
+            Assert.That(!resp.Authorised);
+
+        }
+
+    }
+}
diff --git a/OpenSim/Framework/Tests/ThreadTrackerTests.cs b/OpenSim/Framework/Tests/ThreadTrackerTests.cs
new file mode 100644
index 0000000..37c75ef
--- /dev/null
+++ b/OpenSim/Framework/Tests/ThreadTrackerTests.cs
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using NUnit.Framework;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace OpenSim.Framework.Tests
+{
+    [TestFixture]
+    public class ThreadTrackerTests
+    {
+        private bool running = true;
+        private bool running2 = true;
+
+        [Test]
+        public void DefaultThreadTrackerTest()
+        {
+            List<Thread> lThread = ThreadTracker.GetThreads();
+            
+            /*
+            foreach (Thread t in lThread)
+            {
+                System.Console.WriteLine(t.Name);
+            }
+            */
+
+            Assert.That(lThread.Count == 1);
+            Assert.That(lThread[0].Name == "ThreadTrackerThread");
+        }
+
+        /// <summary>
+        /// Validate that adding a thread to the thread tracker works
+        /// Validate that removing a thread from the thread tracker also works.
+        /// </summary>
+        [Test]
+        public void AddThreadToThreadTrackerTestAndRemoveTest()
+        {
+            Thread t = new Thread(run);
+            t.Name = "TestThread";
+            t.Priority = ThreadPriority.BelowNormal;
+            t.IsBackground = true;
+            t.SetApartmentState(ApartmentState.MTA);
+            t.Start();
+            ThreadTracker.Add(t);
+
+            List<Thread> lThread = ThreadTracker.GetThreads();
+
+            Assert.That(lThread.Count == 2);
+
+            foreach (Thread tr in lThread)
+            {
+                Assert.That((tr.Name == "ThreadTrackerThread" || tr.Name == "TestThread"));
+            }
+            running = false;
+            ThreadTracker.Remove(t);
+
+            lThread = ThreadTracker.GetThreads();
+
+            Assert.That(lThread.Count == 1);
+
+            foreach (Thread tr in lThread)
+            {
+                Assert.That((tr.Name == "ThreadTrackerThread"));
+            }
+
+
+        }
+
+        /// <summary>
+        /// Test a dead thread removal by aborting it and setting it's last seen active date to 50 seconds
+        /// </summary>
+        [Test]
+        public void DeadThreadTest()
+        {
+            Thread t = new Thread(run2);
+            t.Name = "TestThread";
+            t.Priority = ThreadPriority.BelowNormal;
+            t.IsBackground = true;
+            t.SetApartmentState(ApartmentState.MTA);
+            t.Start();
+            ThreadTracker.Add(t);
+            t.Abort();
+            Thread.Sleep(5000);
+            ThreadTracker.m_Threads[1].LastSeenActive = DateTime.Now.Ticks - (50*10000000);
+            ThreadTracker.CleanUp();
+            List<Thread> lThread = ThreadTracker.GetThreads();
+
+            Assert.That(lThread.Count == 1);
+
+            foreach (Thread tr in lThread)
+            {
+                Assert.That((tr.Name == "ThreadTrackerThread"));
+            }
+        }
+
+        [Test]
+        public void UnstartedThreadTest()
+        {
+            Thread t = new Thread(run2);
+            t.Name = "TestThread";
+            t.Priority = ThreadPriority.BelowNormal;
+            t.IsBackground = true;
+            t.SetApartmentState(ApartmentState.MTA);
+            ThreadTracker.Add(t);
+            ThreadTracker.m_Threads[1].LastSeenActive = DateTime.Now.Ticks - (50 * 10000000);
+            ThreadTracker.CleanUp();
+            List<Thread> lThread = ThreadTracker.GetThreads();
+
+            Assert.That(lThread.Count == 1);
+
+            foreach (Thread tr in lThread)
+            {
+                Assert.That((tr.Name == "ThreadTrackerThread"));
+            }
+        }
+
+        [Test]
+        public void NullThreadTest()
+        {
+            Thread t = null;
+            ThreadTracker.Add(t);
+            
+            List<Thread> lThread = ThreadTracker.GetThreads();
+
+            Assert.That(lThread.Count == 1);
+
+            foreach (Thread tr in lThread)
+            {
+                Assert.That((tr.Name == "ThreadTrackerThread"));
+            }
+        }
+
+
+        /// <summary>
+        /// Worker thread 0
+        /// </summary>
+        /// <param name="o"></param>
+        public void run( object o)
+        {
+            while (running)
+            {
+                Thread.Sleep(5000);
+            }
+        }
+
+        /// <summary>
+        /// Worker thread 1
+        /// </summary>
+        /// <param name="o"></param>
+        public void run2(object o)
+        {
+            try
+            {
+                while (running2)
+                {
+                    Thread.Sleep(5000);
+                }
+
+            } 
+            catch (ThreadAbortException)
+            {
+            }
+        }
+
+    }
+}