This changeset is the step 1 of 2 in refactoring

OpenSim.Region.Environment into a "framework" part and a modules only
part. This first changeset refactors OpenSim.Region.Environment.Scenes,
OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces
into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region
modules in OpenSim.Region.Environment.

The next step will be to move region modules up from
OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and
then sort out which modules are really core modules and which should
move out to forge.

I've been very careful to NOT BREAK anything. i hope i've
succeeded. as this is the work of a whole week i hope i managed to
keep track with the applied patches of the last week --- could any of
you that did check in stuff have a look at whether it survived? thx!

5 files changed, 961 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
new file mode 100644
index 0000000..2c6ccc8
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -0,0 +1,176 @@
+/*
+ * 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 OpenSim 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 System.Threading;
+using System.Text;
+using System.Collections.Generic;
+using Nini.Config;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common.Setup;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    [TestFixture]
+    public class EntityManagerTests
+    {        
+        static public Random random;
+        SceneObjectGroup found;
+        Scene scene = SceneSetupHelpers.SetupScene();
+
+        [Test]
+        public void T010_AddObjects()
+        {
+            random = new Random();
+            SceneObjectGroup found;
+            EntityManager entman = new EntityManager();
+            SceneObjectGroup sog = NewSOG();
+            UUID obj1 = sog.UUID;
+            uint li1 = sog.LocalId;
+            entman.Add(sog);
+            sog = NewSOG();
+            UUID obj2 = sog.UUID;
+            uint li2 = sog.LocalId;
+            entman.Add(sog);
+            
+            found = (SceneObjectGroup)entman[obj1];
+            Assert.That(found.UUID ,Is.EqualTo(obj1) );
+            found = (SceneObjectGroup)entman[li1];
+            Assert.That(found.UUID ,Is.EqualTo(obj1) );
+            found = (SceneObjectGroup)entman[obj2];
+            Assert.That(found.UUID ,Is.EqualTo(obj2) );
+            found = (SceneObjectGroup)entman[li2];
+            Assert.That(found.UUID ,Is.EqualTo(obj2) );
+
+            entman.Remove(obj1);
+            entman.Remove(li2);
+
+            Assert.That(entman.ContainsKey(obj1), Is.False);
+            Assert.That(entman.ContainsKey(li1), Is.False);
+            Assert.That(entman.ContainsKey(obj2), Is.False);            
+            Assert.That(entman.ContainsKey(li2), Is.False);
+        }
+
+        [Test]
+        public void T011_ThreadAddRemoveTest()
+        {   
+            // This test adds and removes with mutiple threads, attempting to break the 
+            // uuid and localid dictionary coherence.
+            EntityManager entman = new EntityManager();
+            SceneObjectGroup sog = NewSOG();
+            for (int j=0; j<20; j++)
+            {
+                List<Thread> trdlist = new List<Thread>();
+                
+                for (int i=0; i<4; i++)
+                {
+                    // Adds scene object
+                    NewTestThreads test = new NewTestThreads(entman,sog);
+                    Thread start = new Thread(new ThreadStart(test.TestAddSceneObject));
+                    start.Start();
+                    trdlist.Add(start);
+                        
+                    // Removes it
+                    test = new NewTestThreads(entman,sog);
+                    start = new Thread(new ThreadStart(test.TestRemoveSceneObject));
+                    start.Start();
+                    trdlist.Add(start);
+                }
+                foreach (Thread thread in trdlist) 
+                {
+                    thread.Join();
+                }
+                if (entman.ContainsKey(sog.UUID) || entman.ContainsKey(sog.LocalId)) {
+                    found = (SceneObjectGroup)entman[sog.UUID];
+                    Assert.That(found.UUID,Is.EqualTo(sog.UUID));
+                    found = (SceneObjectGroup)entman[sog.LocalId];
+                    Assert.That(found.UUID,Is.EqualTo(sog.UUID));
+                }
+            }
+        }
+
+        private SceneObjectGroup NewSOG()
+        {
+            SceneObjectGroup sog = new SceneObjectGroup();
+            SceneObjectPart sop = new SceneObjectPart(UUID.Random(), PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
+            sop.Name = RandomName();
+            sop.Description = sop.Name;
+            sop.Text = RandomName();
+            sop.SitName = RandomName();
+            sop.TouchName = RandomName();
+            sop.ObjectFlags |= (uint)PrimFlags.Phantom;
+            
+            sog.SetRootPart(sop);
+
+            scene.AddNewSceneObject(sog, false);
+            
+            return sog;
+        }
+                
+        private static string RandomName()
+        {
+            StringBuilder name = new StringBuilder();
+            int size = random.Next(40,80); 
+            char ch ;
+            for (int i=0; i<size; i++)
+            {       
+                ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65))) ;
+                name.Append(ch);
+            }
+            return name.ToString();
+        }        
+    }
+
+    public class NewTestThreads
+    {
+        private EntityManager entman;
+        private SceneObjectGroup sog;
+        private Random random;
+        
+        public NewTestThreads(EntityManager entman, SceneObjectGroup sog)
+        {
+            this.entman = entman;
+            this.sog = sog;
+            this.random = new Random();
+        }
+        public void TestAddSceneObject()
+        {
+            Thread.Sleep(random.Next(0,50));
+            entman.Add(sog);
+        }
+        public void TestRemoveSceneObject()
+        {
+            Thread.Sleep(random.Next(0,50));
+            entman.Remove(sog.UUID);
+        }
+    }
+}    
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
new file mode 100644
index 0000000..d063eae
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -0,0 +1,139 @@
+/*
+ * 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 OpenSim 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 NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.Communications.Local;
+using OpenSim.Region.Environment.Scenes;
+using OpenSim.Tests.Common.Mock;
+using OpenSim.Tests.Common.Setup;
+
+namespace OpenSim.Region.Environment.Scenes.Tests
+{
+    /// <summary>
+    /// Basic scene object tests (create, read and delete but not update).
+    /// </summary>
+    [TestFixture]
+    public class SceneObjectTests
+    {         
+        /// <summary>
+        /// Test adding an object to a scene.
+        /// </summary>
+        [Test]
+        public void TestAddSceneObject()
+        {              
+            Scene scene = SceneSetupHelpers.SetupScene();
+            SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+            
+            //System.Console.WriteLine("retrievedPart : {0}", retrievedPart);
+            // If the parts have the same UUID then we will consider them as one and the same
+            Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));         
+        }
+        
+        /// <summary>
+        /// Test deleting an object from a scene.
+        /// </summary>
+        [Test]
+        public void TestDeleteSceneObject()
+        {
+            TestScene scene = SceneSetupHelpers.SetupScene();         
+            SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
+            scene.DeleteSceneObject(part.ParentGroup, false);
+            
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);            
+            Assert.That(retrievedPart, Is.Null);
+        }
+        
+        /// <summary>
+        /// Test deleting an object asynchronously
+        /// </summary>
+        [Test]
+        public void TestDeleteSceneObjectAsync()
+        {
+            UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
+            
+            TestScene scene = SceneSetupHelpers.SetupScene();
+            
+            // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
+            AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
+            sogd.Enabled = false;
+                
+            SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
+            
+            IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId);
+            scene.DeRezObject(client, part.LocalId, UUID.Zero, DeRezAction.Delete, UUID.Zero);
+            
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+            Assert.That(retrievedPart, Is.Not.Null);
+            
+            sogd.InventoryDeQueueAndDelete();
+            SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId);
+            Assert.That(retrievedPart2, Is.Null);            
+        }
+ 
+        /// <summary>
+        /// Test deleting an object asynchronously to user inventory.
+        /// </summary>
+        [Test]
+        public void TestDeleteSceneObjectAsyncToUserInventory()
+        {
+            //log4net.Config.XmlConfigurator.Configure();                  
+            
+            UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
+            string myObjectName = "Fred";
+            
+            TestScene scene = SceneSetupHelpers.SetupScene();                
+            SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene, myObjectName);
+            
+            Assert.That(
+                scene.CommsManager.UserAdminService.AddUser(
+                    "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
+                Is.EqualTo(agentId));  
+            
+            IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId);
+                                                
+            CachedUserInfo userInfo = scene.CommsManager.UserProfileCacheService.GetUserDetails(agentId);
+            Assert.That(userInfo, Is.Not.Null);
+            Assert.That(userInfo.RootFolder, Is.Not.Null);
+            
+            SceneSetupHelpers.DeleteSceneObjectAsync(scene, part, DeRezAction.Take, userInfo.RootFolder.ID, client);
+            
+            // Check that we now have the taken part in our inventory
+            Assert.That(myObjectName, Is.EqualTo(userInfo.RootFolder.FindItemByPath(myObjectName).Name));
+            
+            // Check that the taken part has actually disappeared
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+            Assert.That(retrievedPart, Is.Null);                             
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
new file mode 100644
index 0000000..30b0987
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -0,0 +1,249 @@
+/*
+ * 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 OpenSim 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 NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.Communications.Local;
+using OpenSim.Region.Environment.Scenes;
+using OpenSim.Tests.Common.Mock;
+using OpenSim.Tests.Common.Setup;
+
+namespace OpenSim.Region.Environment.Scenes.Tests
+{
+    /// <summary>
+    /// Linking tests
+    /// </summary>
+    [TestFixture]    
+    public class SceneObjectLinkingTests
+    {
+        [Test]
+        public void TestLinkDelink2SceneObjects()
+        {
+            bool debugtest = false; 
+
+            Scene scene = SceneSetupHelpers.SetupScene();
+            SceneObjectPart part1 = SceneSetupHelpers.AddSceneObject(scene);
+            SceneObjectGroup grp1 = part1.ParentGroup;
+            SceneObjectPart part2 = SceneSetupHelpers.AddSceneObject(scene);
+            SceneObjectGroup grp2 = part2.ParentGroup;
+
+            grp1.AbsolutePosition = new Vector3(10, 10, 10);
+            grp2.AbsolutePosition = Vector3.Zero;
+            
+            // <90,0,0>
+            grp1.Rotation = (Quaternion.CreateFromEulers(90 * Utils.DEG_TO_RAD, 0, 0));
+
+            // <180,0,0>
+            grp2.UpdateGroupRotation(Quaternion.CreateFromEulers(180 * Utils.DEG_TO_RAD, 0, 0));
+            
+            // Required for linking
+            grp1.RootPart.UpdateFlag = 0;
+            grp2.RootPart.UpdateFlag = 0;
+
+            // Link grp2 to grp1.   part2 becomes child prim to grp1. grp2 is eliminated.
+            grp1.LinkToGroup(grp2);
+
+            // FIXME: Can't do this test yet since group 2 still has its root part!  We can't yet null this since
+            // it might cause SOG.ProcessBackup() to fail due to the race condition.  This really needs to be fixed.
+            Assert.That(grp2.IsDeleted, "SOG 2 was not registered as deleted after link.");
+            Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained children after delink.");
+            Assert.That(grp1.Children.Count == 2);
+
+            if (debugtest)
+            {
+                System.Console.WriteLine("parts: {0}", grp1.Children.Count);
+                System.Console.WriteLine("Group1: Pos:{0}, Rot:{1}", grp1.AbsolutePosition, grp1.Rotation);
+                System.Console.WriteLine("Group1: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part1.OffsetPosition, part1.RotationOffset);
+                System.Console.WriteLine("Group1: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part2.OffsetPosition, part2.RotationOffset);
+            }
+
+            // root part should have no offset position or rotation
+            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity);
+
+            // offset position should be root part position - part2.absolute position.
+            Assert.That(part2.OffsetPosition == new Vector3(-10, -10, -10));
+
+            float roll = 0;
+            float pitch = 0;
+            float yaw = 0;
+
+            // There's a euler anomoly at 180, 0, 0 so expect 180 to turn into -180.
+            part1.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
+            Vector3 rotEuler1 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
+            
+            if (debugtest)
+                System.Console.WriteLine(rotEuler1);
+
+            part2.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
+            Vector3 rotEuler2 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
+             
+            if (debugtest)
+                System.Console.WriteLine(rotEuler2);
+
+            Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f));
+
+            // Delink part 2
+            grp1.DelinkFromGroup(part2.LocalId);
+
+            if (debugtest)
+                System.Console.WriteLine("Group2: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part2.AbsolutePosition, part2.RotationOffset);
+
+            Assert.That(grp1.Children.Count, Is.EqualTo(1), "Group 1 still contained part2 after delink.");
+            Assert.That(part2.AbsolutePosition == Vector3.Zero);            
+        }
+
+        [Test]
+        public void TestLinkDelink2groups4SceneObjects()
+        {
+            bool debugtest = false;
+
+            Scene scene = SceneSetupHelpers.SetupScene();
+            SceneObjectPart part1 = SceneSetupHelpers.AddSceneObject(scene);
+            SceneObjectGroup grp1 = part1.ParentGroup;
+            SceneObjectPart part2 = SceneSetupHelpers.AddSceneObject(scene);
+            SceneObjectGroup grp2 = part2.ParentGroup;
+            SceneObjectPart part3 = SceneSetupHelpers.AddSceneObject(scene);
+            SceneObjectGroup grp3 = part3.ParentGroup;
+            SceneObjectPart part4 = SceneSetupHelpers.AddSceneObject(scene);
+            SceneObjectGroup grp4 = part4.ParentGroup;
+
+            grp1.AbsolutePosition = new Vector3(10, 10, 10);
+            grp2.AbsolutePosition = Vector3.Zero;
+            grp3.AbsolutePosition = new Vector3(20, 20, 20);
+            grp4.AbsolutePosition = new Vector3(40, 40, 40);
+
+            // <90,0,0>
+            grp1.Rotation = (Quaternion.CreateFromEulers(90 * Utils.DEG_TO_RAD, 0, 0));
+
+            // <180,0,0>
+            grp2.UpdateGroupRotation(Quaternion.CreateFromEulers(180 * Utils.DEG_TO_RAD, 0, 0));
+
+            // <270,0,0>
+            grp3.Rotation = (Quaternion.CreateFromEulers(270 * Utils.DEG_TO_RAD, 0, 0));
+
+            // <0,90,0>
+            grp4.UpdateGroupRotation(Quaternion.CreateFromEulers(0, 90 * Utils.DEG_TO_RAD, 0));
+
+            // Required for linking
+            grp1.RootPart.UpdateFlag = 0;
+            grp2.RootPart.UpdateFlag = 0;
+            grp3.RootPart.UpdateFlag = 0;
+            grp4.RootPart.UpdateFlag = 0;
+
+            // Link grp2 to grp1.   part2 becomes child prim to grp1. grp2 is eliminated.
+            grp1.LinkToGroup(grp2);
+
+            // Link grp4 to grp3.
+            grp3.LinkToGroup(grp4);
+            
+            // At this point we should have 4 parts total in two groups.            
+            Assert.That(grp1.Children.Count == 2);
+            Assert.That(grp2.IsDeleted, "Group 2 was not registered as deleted after link.");
+            Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink.");            
+            Assert.That(grp3.Children.Count == 2);
+            Assert.That(grp4.IsDeleted, "Group 4 was not registered as deleted after link.");
+            Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink.");            
+            
+            if (debugtest)
+            {
+                System.Console.WriteLine("--------After Link-------");
+                System.Console.WriteLine("Group1: parts: {0}", grp1.Children.Count);
+                System.Console.WriteLine("Group1: Pos:{0}, Rot:{1}", grp1.AbsolutePosition, grp1.Rotation);
+                System.Console.WriteLine("Group1: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part1.OffsetPosition, part1.RotationOffset);
+                System.Console.WriteLine("Group1: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part2.OffsetPosition, part2.RotationOffset);
+                
+                System.Console.WriteLine("Group3: parts: {0}", grp3.Children.Count);
+                System.Console.WriteLine("Group3: Pos:{0}, Rot:{1}", grp3.AbsolutePosition, grp3.Rotation);
+                System.Console.WriteLine("Group3: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part3.OffsetPosition, part3.RotationOffset);
+                System.Console.WriteLine("Group3: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part4.OffsetPosition, part4.RotationOffset);
+            }            
+
+            // Required for linking
+            grp1.RootPart.UpdateFlag = 0;
+            grp3.RootPart.UpdateFlag = 0;
+
+            // root part should have no offset position or rotation
+            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity);
+
+            // offset position should be root part position - part2.absolute position.
+            Assert.That(part2.OffsetPosition == new Vector3(-10, -10, -10));
+
+            float roll = 0;
+            float pitch = 0;
+            float yaw = 0;
+
+            // There's a euler anomoly at 180, 0, 0 so expect 180 to turn into -180.
+            part1.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
+            Vector3 rotEuler1 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
+
+            if (debugtest)
+                System.Console.WriteLine(rotEuler1);
+
+            part2.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
+            Vector3 rotEuler2 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
+
+            if (debugtest)
+                System.Console.WriteLine(rotEuler2);
+
+            Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f));
+
+            // Now we're linking the first group to the third group.  This will make the first group child parts of the third one.
+            grp3.LinkToGroup(grp1);
+
+            // Delink parts 2 and 3
+            grp3.DelinkFromGroup(part2.LocalId);
+            grp3.DelinkFromGroup(part3.LocalId);
+
+            if (debugtest)
+            {
+                System.Console.WriteLine("--------After De-Link-------");
+                System.Console.WriteLine("Group1: parts: {0}", grp1.Children.Count);
+                System.Console.WriteLine("Group1: Pos:{0}, Rot:{1}", grp1.AbsolutePosition, grp1.Rotation);
+                System.Console.WriteLine("Group1: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part1.OffsetPosition, part1.RotationOffset);
+                System.Console.WriteLine("NoGroup: Prim2: AbsolutePosition:{0}, OffsetRotation:{1}", part2.AbsolutePosition, part2.RotationOffset);
+
+                System.Console.WriteLine("Group3: parts: {0}", grp3.Children.Count);
+                System.Console.WriteLine("Group3: Pos:{0}, Rot:{1}", grp3.AbsolutePosition, grp3.Rotation);
+                System.Console.WriteLine("Group3: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part3.OffsetPosition, part3.RotationOffset);
+                System.Console.WriteLine("Group3: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part4.OffsetPosition, part4.RotationOffset);
+            }
+
+            Assert.That(part2.AbsolutePosition == Vector3.Zero);
+            Assert.That(part4.OffsetPosition == new Vector3(20, 20, 20));
+            Quaternion compareQuaternion = new Quaternion(0, 0.7071068f, 0, 0.7071068f);
+            Assert.That((part4.RotationOffset.X - compareQuaternion.X < 0.00003) 
+                && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003) 
+                && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003) 
+                && (part4.RotationOffset.W - compareQuaternion.W < 0.00003));
+        }        
+    }
+}
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
new file mode 100644
index 0000000..dc8df32
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -0,0 +1,292 @@
+/*
+ * 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 OpenSim 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 Nini.Config;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Environment.Modules.Communications.Local;
+using OpenSim.Region.Environment.Modules.World.Serialiser;
+using OpenSim.Tests.Common.Mock;
+using OpenSim.Tests.Common.Setup;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    /// <summary>
+    /// Scene presence tests
+    /// </summary>
+    [TestFixture]
+    public class ScenePresenceTests
+    {
+        public Scene scene, scene2, scene3;
+        public UUID agent1, agent2, agent3;
+        public static Random random;
+        public ulong region1,region2,region3;
+        public CommunicationsManager cm;
+        public AgentCircuitData acd1;
+        public SceneObjectGroup sog1, sog2, sog3;
+        public TestClient testclient;
+
+        [TestFixtureSetUp]
+        public void Init()
+        {
+            cm = new TestCommunicationsManager();
+            scene = SceneSetupHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000, cm);
+            scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000, cm);
+            scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm);
+
+            agent1 = UUID.Random();
+            agent2 = UUID.Random();
+            agent3 = UUID.Random();
+            random = new Random();
+            sog1 = NewSOG(UUID.Random(), scene, agent1);
+            sog2 = NewSOG(UUID.Random(), scene, agent1);
+            sog3 = NewSOG(UUID.Random(), scene, agent1);
+
+            //ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
+            region1 = scene.RegionInfo.RegionHandle;
+            region2 = scene2.RegionInfo.RegionHandle;
+            region3 = scene3.RegionInfo.RegionHandle;
+        }
+
+        /// <summary>
+        /// Test adding a root agent to a scene.  Doesn't yet actually complete crossing the agent into the scene.
+        /// </summary>        
+        [Test]
+        public void T010_TestAddRootAgent()
+        {
+            string firstName = "testfirstname";
+
+            AgentCircuitData agent = new AgentCircuitData();
+            agent.AgentID = agent1;
+            agent.firstname = firstName;
+            agent.lastname = "testlastname";
+            agent.SessionID = UUID.Zero;
+            agent.SecureSessionID = UUID.Zero;
+            agent.circuitcode = 123;
+            agent.BaseFolder = UUID.Zero;
+            agent.InventoryFolder = UUID.Zero;
+            agent.startpos = Vector3.Zero;
+            agent.CapsPath = GetRandomCapsObjectPath();
+
+            scene.NewUserConnection(agent);
+            testclient = new TestClient(agent, scene);
+            scene.AddNewClient(testclient);
+
+            ScenePresence presence = scene.GetScenePresence(agent1);
+
+            Assert.That(presence, Is.Not.Null, "presence is null");
+            Assert.That(presence.Firstname, Is.EqualTo(firstName), "First name not same");
+            acd1 = agent;
+        }
+
+        /// <summary>
+        /// Test removing an uncrossed root agent from a scene.
+        /// </summary>
+        [Test]
+        public void T011_TestRemoveRootAgent()
+        {
+            scene.RemoveClient(agent1);
+
+            ScenePresence presence = scene.GetScenePresence(agent1);
+
+            Assert.That(presence, Is.Null, "presence is not null");
+        }
+
+        [Test]
+        public void T012_TestAddNeighbourRegion()
+        {
+            SceneSetupHelpers.AddRootAgent(scene,agent1);
+
+            ScenePresence presence = scene.GetScenePresence(agent1);
+
+            string cap = presence.ControllingClient.RequestClientInfo().CapsPath;
+
+            presence.AddNeighbourRegion(region2, cap);
+            presence.AddNeighbourRegion(region3, cap);
+
+            List<ulong> neighbours = presence.GetKnownRegionList();
+
+            Assert.That(neighbours.Count, Is.EqualTo(2));
+        }
+
+        [Test]
+        public void T013_TestRemoveNeighbourRegion()
+        {
+            ScenePresence presence = scene.GetScenePresence(agent1);
+            presence.RemoveNeighbourRegion(region3);
+
+            List<ulong> neighbours = presence.GetKnownRegionList();
+            Assert.That(neighbours.Count,Is.EqualTo(1));
+            /*
+            presence.MakeChildAgent;
+            presence.MakeRootAgent;
+            CompleteAvatarMovement
+            */
+        }
+
+        [Test]
+        public void T020_TestMakeRootAgent()
+        {
+            ScenePresence presence = scene.GetScenePresence(agent1);
+            Assert.That(presence.IsChildAgent, Is.False, "Starts out as a root agent");
+
+            presence.MakeChildAgent();
+            Assert.That(presence.IsChildAgent, Is.True, "Did not change to child agent after MakeChildAgent");
+
+            // Accepts 0 but rejects Constants.RegionSize
+            Vector3 pos = new Vector3(0,Constants.RegionSize-1,0);
+            presence.MakeRootAgent(pos,true);
+            Assert.That(presence.IsChildAgent, Is.False, "Did not go back to root agent");
+            Assert.That(presence.AbsolutePosition, Is.EqualTo(pos), "Position is not the same one entered");
+        }
+
+        [Test]
+        public void T021_TestCrossToNewRegion()
+        {
+            // Adding child agent to region 1001
+            scene2.NewUserConnection(acd1);
+            scene2.AddNewClient(testclient);
+
+            ScenePresence presence = scene.GetScenePresence(agent1);
+            ScenePresence presence2 = scene2.GetScenePresence(agent1);
+
+            // Adding neighbour region caps info to presence2
+            string cap = presence.ControllingClient.RequestClientInfo().CapsPath;
+            presence2.AddNeighbourRegion(region1, cap);
+
+            Assert.That(presence.IsChildAgent, Is.False, "Did not start root in origin region.");
+            Assert.That(presence2.IsChildAgent, Is.True, "Is not a child on destination region.");
+
+            // Cross to x+1
+            presence.AbsolutePosition = new Vector3(Constants.RegionSize+1,3,100);
+            scene.RegisterRegionWithGrid();
+            scene2.RegisterRegionWithGrid();
+            presence.Update();
+
+            Assert.That(presence.IsChildAgent, Is.True, "Did not complete region cross as expected.");
+            Assert.That(presence2.IsChildAgent, Is.False, "Did not receive root status after receiving agent.");
+
+            // Cross Back
+            presence2.AbsolutePosition = new Vector3(-1, 3, 100);
+            presence2.Update();
+
+            Assert.That(presence2.IsChildAgent, Is.True, "Did not return from region as expected.");
+            Assert.That(presence.IsChildAgent, Is.False, "Presence was not made root in old region again.");
+        }
+
+        [Test]
+        public void T030_TestAddAttachments()
+        {
+            ScenePresence presence = scene.GetScenePresence(agent1);
+
+            presence.AddAttachment(sog1);
+            presence.AddAttachment(sog2);
+            presence.AddAttachment(sog3);
+
+            Assert.That(presence.HasAttachments(), Is.True);
+            Assert.That(presence.ValidateAttachments(), Is.True);
+        }
+
+        [Test]
+        public void T031_RemoveAttachments()
+        {
+            ScenePresence presence = scene.GetScenePresence(agent1);
+            presence.RemoveAttachment(sog1);
+            presence.RemoveAttachment(sog2);
+            presence.RemoveAttachment(sog3);
+            Assert.That(presence.HasAttachments(), Is.False);
+        }
+
+        [Test]
+        public void T032_CrossAttachments()
+        {
+            ScenePresence presence = scene.GetScenePresence(agent1);
+            ScenePresence presence2 = scene2.GetScenePresence(agent1);
+            presence2.AddAttachment(sog1);
+            presence2.AddAttachment(sog2);
+
+            IRegionModule serialiser = new SerialiserModule();
+            SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), serialiser);
+            SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), serialiser);
+
+            Assert.That(presence.HasAttachments(), Is.False, "Presence has attachments before cross");
+
+            Assert.That(presence2.CrossAttachmentsIntoNewRegion(region1, true), Is.True, "Cross was not successful");
+            Assert.That(presence2.HasAttachments(), Is.False, "Presence2 objects were not deleted");
+            Assert.That(presence.HasAttachments(), Is.True, "Presence has not received new objects");
+        }
+
+        public static string GetRandomCapsObjectPath()
+        {
+            UUID caps = UUID.Random();
+            string capsPath = caps.ToString();
+            capsPath = capsPath.Remove(capsPath.Length - 4, 4);
+            return capsPath;
+        }
+
+        private SceneObjectGroup NewSOG(UUID uuid, Scene scene, UUID agent)
+        {
+            SceneObjectPart sop = new SceneObjectPart();
+            sop.Name = RandomName();
+            sop.Description = RandomName();
+            sop.Text = RandomName();
+            sop.SitName = RandomName();
+            sop.TouchName = RandomName();
+            sop.UUID = uuid;
+            sop.Shape = PrimitiveBaseShape.Default;
+            sop.Shape.State = 1;
+            sop.OwnerID = agent;
+
+            SceneObjectGroup sog = new SceneObjectGroup();
+            sog.SetScene(scene);
+            sog.SetRootPart(sop);
+
+            return sog;
+        }
+
+        private static string RandomName()
+        {
+            StringBuilder name = new StringBuilder();
+            int size = random.Next(5,12);
+            char ch ;
+            for (int i=0; i<size; i++)
+            {
+                ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65))) ;
+                name.Append(ch);
+            }
+            return name.ToString();
+        }
+    }
+}
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
new file mode 100644
index 0000000..a78faa6
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -0,0 +1,105 @@
+/*
+ * 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 OpenSim 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 Nini.Config;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Environment.Modules.Communications.REST;
+using OpenSim.Tests.Common.Mock;
+using OpenSim.Tests.Common.Setup;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    /// <summary>
+    /// Teleport tests in a standalone OpenSim
+    /// </summary>    
+    [TestFixture]
+    public class StandaloneTeleportTests
+    {
+        /// <summary>
+        /// Test a teleport between two regions that are not neighbours and do not share any neighbours in common.
+        /// </summary>
+        /// Does not yet do what is says on the tin.
+        [Test]        
+        public void TestSimpleNotNeighboursTeleport()
+        {
+            //log4net.Config.XmlConfigurator.Configure();
+            
+            UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100");
+            UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200");
+            CommunicationsManager cm = new TestCommunicationsManager();
+
+            // shared module
+            IRegionModule interregionComms = new RESTInterregionComms();
+            
+            Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm);
+            SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
+            sceneA.RegisterRegionWithGrid();
+            
+            Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm);
+            SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms);
+            sceneB.RegisterRegionWithGrid();
+ 
+            UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041");                      
+            TestClient client = SceneSetupHelpers.AddRootAgent(sceneA, agentId);
+ 
+            ICapabilitiesModule sceneACapsModule = sceneA.RequestModuleInterface<ICapabilitiesModule>();
+            
+            Assert.That(
+                sceneACapsModule.GetCapsPath(agentId), 
+                Is.EqualTo(client.CapsSeedUrl), 
+                "Incorrect caps object path set up in sceneA");
+                        
+            // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used.
+            client.TeleportTargetScene = sceneB;            
+            client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
+            
+            Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB");                                   
+            Assert.That(sceneA.GetScenePresence(agentId), Is.Null, "Client still had an agent in sceneA");
+            
+            ICapabilitiesModule sceneBCapsModule = sceneB.RequestModuleInterface<ICapabilitiesModule>();
+            
+            // Temporary assertion - caps url construction should at least be doable through a method.
+            Assert.That(
+                "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/", 
+                Is.EqualTo(client.CapsSeedUrl), 
+                "Incorrect caps object path set up in sceneB");  
+            
+            // This assertion will currently fail since we don't remove the caps paths when no longer needed
+            //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path");
+            
+            // TODO: Check that more of everything is as it should be
+            
+            // TODO: test what happens if we try to teleport to a region that doesn't exist
+        }
+    }
+}
\ No newline at end of file