From 3e30de7430bff6f2eede395140e45207a15c23a5 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 30 Apr 2010 22:35:07 +0200
Subject: Fix linking issue introduced in my earlier commit

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 90bce39..cfcd544 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1970,8 +1970,17 @@ namespace OpenSim.Region.Framework.Scenes
             List<SceneObjectPart> children = new List<SceneObjectPart>();
             SceneObjectPart root = GetSceneObjectPart(parentPrimId);
 
-            if (Permissions.CanLinkObject(client.AgentId, root.ParentGroup.RootPart.UUID))
+            if (root == null)
+            {
+                m_log.DebugFormat("[LINK]: Can't find linkset root prim {0{", parentPrimId);
+                return;
+            }
+
+            if (!Permissions.CanLinkObject(client.AgentId, root.ParentGroup.RootPart.UUID))
+            {
+                m_log.DebugFormat("[LINK]: Refusing link. No permissions on root prim");
                 return;
+            }
 
             foreach (uint localID in childPrimIds)
             {
@@ -1990,7 +1999,16 @@ namespace OpenSim.Region.Framework.Scenes
             // Must be all one owner
             //
             if (owners.Count > 1)
+            {
+                m_log.DebugFormat("[LINK]: Refusing link. Too many owners");
+                return;
+            }
+
+            if (children.Count == 0)
+            {
+                m_log.DebugFormat("[LINK]: Refusing link. No permissions to link any of the children");
                 return;
+            }
 
             m_sceneGraph.LinkObjects(root, children);
         }
-- 
cgit v1.1