Merge branch 'master' into careminster-presence-refactor

8 files changed, 52 insertions, 196 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 2d80382..3fb2c8c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -741,7 +741,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         public void TestMergeIarPath()
         {
             TestHelper.InMethod();
-            log4net.Config.XmlConfigurator.Configure();
+//            log4net.Config.XmlConfigurator.Configure();
             
             Scene scene = SceneSetupHelpers.SetupScene("inventory");
             UserAccount ua1 = UserProfileTestUtils.CreateUserWithInventory(scene);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index b2e3f4f..023a44c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -233,6 +233,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return m_GridService.GetFallbackRegions(scopeID, x, y);
         }
 
+        public List<GridRegion> GetHyperlinks(UUID scopeID)
+        {
+            return m_GridService.GetHyperlinks(scopeID);
+        }
+        
         public int GetRegionFlags(UUID scopeID, UUID regionID)
         {
             return m_GridService.GetRegionFlags(scopeID, regionID);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index 95d8737..2726ae8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -136,6 +136,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
                 900 * (int)Constants.RegionSize, 1100 * (int)Constants.RegionSize);
             Assert.IsNotNull(results, "Retrieved GetRegionRange list is null");
             Assert.That(results.Count, Is.EqualTo(2), "Retrieved neighbour collection is not the number expected");
+
+            results = m_LocalConnector.GetHyperlinks(UUID.Zero);
+            Assert.IsNotNull(results, "Retrieved GetHyperlinks list is null");
+            Assert.That(results.Count, Is.EqualTo(0), "Retrieved linked regions collection is not the number expected");
+
         }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index c0ec5df..5acc227 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1824,6 +1824,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="originalPrim"></param>
         /// <param name="offset"></param>
         /// <param name="flags"></param>
+        /// <param name="AgentID"></param>
+        /// <param name="GroupID"></param>
         protected internal void DuplicateObject(uint originalPrim, Vector3 offset, uint flags, UUID AgentID, UUID GroupID)
         {
             //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID);
@@ -1838,7 +1840,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="originalPrim"></param>
         /// <param name="offset"></param>
         /// <param name="flags"></param>
-        protected internal SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot)
+        /// <param name="AgentID"></param>
+        /// <param name="GroupID"></param>
+        /// <param name="rot"></param>
+        public SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot)
         {
             //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID);
             SceneObjectGroup original = GetGroupByPrim(originalPrimID);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index efdc19c..773b012 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1182,6 +1182,10 @@ namespace OpenSim.Region.Framework.Scenes
             set { _nextOwnerMask = value; }
         }
 
+        /// <summary>
+        /// Property flags.  See OpenMetaverse.PrimFlags 
+        /// </summary>      
+        /// Example properties are PrimFlags.Phantom and PrimFlags.DieAtEdge
         public PrimFlags Flags
         {
             get { return _flags; }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
index 42587c1..8a103d7 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -26,61 +26,46 @@
  */
 
 using System;
+using System.Reflection;
 using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
-using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+using OpenSim.Tests.Common.Setup;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
-    /// <summary>
-    /// Scene presence tests
-    /// </summary>
     [TestFixture]
-    public class SceneBaseTests
+    public class SceneGraphTests
     {
-        private class SceneBaseImpl : SceneBase
+        [Test]
+        public void TestDuplicateObject()
         {
-            public override void Update()
-            {
-                throw new NotImplementedException();
-            }
-
-            public override void LoadWorldMap()
-            {
-                throw new NotImplementedException();
-            }
-
-            public override void AddNewClient(IClientAPI client)
-            {
-                throw new NotImplementedException();
-            }
-
-            public override void RemoveClient(UUID agentID)
-            {
-                throw new NotImplementedException();
-            }
+            TestHelper.InMethod();
+            Scene scene = SceneSetupHelpers.SetupScene();
 
-            public override void OtherRegionUp(GridRegion otherRegion)
-            {
-                throw new NotImplementedException();
-            }
+            UUID ownerUuid = new UUID("00000000-0000-0000-0000-000000000010");
+            string objName = "obj1";
+            UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
 
-            public override bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence)
-            {
-                throw new NotImplementedException();
-            }
+            SceneObjectPart part
+                = new SceneObjectPart(ownerUuid, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                    { Name = objName, UUID = objUuid };
 
-            public override bool CheckClient(UUID agentID, System.Net.IPEndPoint ep)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        [Test]
-        public void TestConstructor()
-        {
-            new SceneBaseImpl();
-        }
+            scene.AddNewSceneObject(new SceneObjectGroup(part), false);
+            
+            SceneObjectGroup duplicatedSo 
+                = scene.SceneGraph.DuplicateObject(
+                    part.LocalId, new Vector3(10, 0, 0), 0, ownerUuid, UUID.Zero, Quaternion.Identity);
+            
+            Assert.That(duplicatedSo.Children.Count, Is.EqualTo(1));
+            Assert.That(duplicatedSo.RootPart.LocalId, Is.Not.EqualTo(part.LocalId));
+            
+            //SceneObjectPart retrievedPart = scene.GetSceneObjectPart(objUuid);
+        }        
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 4baa22c..d4f9f18 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -32,7 +32,6 @@ using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
deleted file mode 100644
index 8b2d387..0000000
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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 System.Collections.Generic;
-using NUnit.Framework;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-
-namespace OpenSim.Region.Framework.Scenes.Tests
-{
-    /// <summary>
-    /// Scene presence tests
-    /// </summary>
-    [TestFixture]
-    public class SceneTests
-    {
-        private class FakeStorageManager : StorageManager
-        {
-            private class FakeRegionDataStore : IRegionDataStore
-            {
-                public void Initialise(string filename)
-                {
-                }
-
-                public void Dispose()
-                {
-                }
-
-                public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public void RemoveObject(UUID uuid, UUID regionUUID)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public void StoreTerrain(double[,] terrain, UUID regionID)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public double[,] LoadTerrain(UUID regionID)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public void StoreLandObject(ILandObject Parcel)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public void RemoveLandObject(UUID globalID)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public List<LandData> LoadLandObjects(UUID regionUUID)
-                {
-                    throw new NotImplementedException();
-                }
-
-                public void StoreRegionSettings(RegionSettings rs)
-                {
-                    throw new NotImplementedException();
-                }
-                public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
-                {
-                    //This connector doesn't support the windlight module yet
-                    //Return default LL windlight settings
-                    return new RegionLightShareData();
-                }
-                public void StoreRegionWindlightSettings(RegionLightShareData wl)
-                {
-                    //This connector doesn't support the windlight module yet
-                }
-                public RegionSettings LoadRegionSettings(UUID regionUUID)
-                {
-                    return null;
-                }
-
-                public void Shutdown()
-                {
-                    throw new NotImplementedException();
-                }
-            }
-
-            public FakeStorageManager() : base(new FakeRegionDataStore())
-            {
-            }
-
-            public FakeStorageManager(IRegionDataStore storage) : this()
-            {
-            }
-
-            public FakeStorageManager(string dllName, string connectionstring, string estateconnectionstring) : this()
-            {
-            }
-        }
-
-        [Test]
-        public void TestConstructor()
-        {
-            RegionInfo regionInfo = new RegionInfo(0,0,null,null);
-            FakeStorageManager storageManager = new FakeStorageManager();
-
-            new Scene(regionInfo, null, null, storageManager, null, false, false, false, null, null);
-        }
-    }
-}