Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork

Conflicts:
	prebuild.xml

1 files changed, 20 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index a2332bb..be5b4a8 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -39,14 +39,31 @@ using log4net;
 
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
-    /// <summary>
-    /// Linking tests
-    /// </summary>
     [TestFixture]
     public class SceneObjectLinkingTests
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>
+        /// Links to self should be ignored.
+        /// </summary>
+        [Test]
+        public void TestLinkToSelf()
+        {
+            TestHelpers.InMethod();
+
+            UUID ownerId = TestHelpers.ParseTail(0x1);
+            int nParts = 3;
+
+            TestScene scene = SceneHelpers.SetupScene();
+            SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(nParts, ownerId, "TestLinkToSelf_", 0x10);
+            scene.AddSceneObject(sog1);
+            scene.LinkObjects(ownerId, sog1.LocalId, new List<uint>() { sog1.Parts[1].LocalId });
+//            sog1.LinkToGroup(sog1);
+
+            Assert.That(sog1.Parts.Length, Is.EqualTo(nParts));
+        }
+
         [Test]
         public void TestLinkDelink2SceneObjects()
         {