Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 18 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b4a155e..e528288 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2014,6 +2014,24 @@ namespace OpenSim.Region.Framework.Scenes
             if (objectGroup == this)
                 return;
 
+            // If the configured linkset capacity is greater than zero,
+            // and the new linkset would have a prim count higher than this
+            // value, do not link it.
+            if (m_scene.m_linksetCapacity > 0 &&
+                    (PrimCount + objectGroup.PrimCount) >
+                    m_scene.m_linksetCapacity)
+            {
+                m_log.DebugFormat(
+                        "[SCENE OBJECT GROUP]: Cannot link group with root" +
+                        " part {0}, {1} ({2} prims) to group with root part" +
+                        " {3}, {4} ({5} prims) because the new linkset" +
+                        " would exceed the configured maximum of {6}",
+                        objectGroup.RootPart.Name, objectGroup.RootPart.UUID,
+                        objectGroup.PrimCount, RootPart.Name, RootPart.UUID,
+                        PrimCount, m_scene.m_linksetCapacity);
+                return;
+            }
+
             // 'linkPart' == the root of the group being linked into this group
             SceneObjectPart linkPart = objectGroup.m_rootPart;