diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 91b2ee7aa7..66b9f06fc4 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -153,6 +153,7 @@ namespace OpenSim.Region.ClientStack.Linden
             // tell it about scene object limits
             m_ModelCost.NonPhysicalPrimScaleMax = m_Scene.m_maxNonphys;
             m_ModelCost.PhysicalPrimScaleMax = m_Scene.m_maxPhys;
+            m_ModelCost.ObjectLinkedPartsMax = m_Scene.m_linksetCapacity;
             
 //            m_ModelCost.ObjectLinkedPartsMax = ??
 //            m_ModelCost.PrimScaleMin = ??
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
index a91f3be185..29bde6c063 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             int numberInstances = resources.instance_list.Array.Count;
 
-            if( numberInstances > ObjectLinkedPartsMax )
+            if (ObjectLinkedPartsMax != 0 && numberInstances > ObjectLinkedPartsMax)
             {
                 error = "Model would have more than " + ObjectLinkedPartsMax.ToString() + " linked prims";
                 return false;