aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs1
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs2
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 91b2ee7..66b9f06 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
153 // tell it about scene object limits 153 // tell it about scene object limits
154 m_ModelCost.NonPhysicalPrimScaleMax = m_Scene.m_maxNonphys; 154 m_ModelCost.NonPhysicalPrimScaleMax = m_Scene.m_maxNonphys;
155 m_ModelCost.PhysicalPrimScaleMax = m_Scene.m_maxPhys; 155 m_ModelCost.PhysicalPrimScaleMax = m_Scene.m_maxPhys;
156 m_ModelCost.ObjectLinkedPartsMax = m_Scene.m_linksetCapacity;
156 157
157// m_ModelCost.ObjectLinkedPartsMax = ?? 158// m_ModelCost.ObjectLinkedPartsMax = ??
158// m_ModelCost.PrimScaleMin = ?? 159// m_ModelCost.PrimScaleMin = ??
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
index a91f3be..29bde6c 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
140 140
141 int numberInstances = resources.instance_list.Array.Count; 141 int numberInstances = resources.instance_list.Array.Count;
142 142
143 if( numberInstances > ObjectLinkedPartsMax ) 143 if (ObjectLinkedPartsMax != 0 && numberInstances > ObjectLinkedPartsMax)
144 { 144 {
145 error = "Model would have more than " + ObjectLinkedPartsMax.ToString() + " linked prims"; 145 error = "Model would have more than " + ObjectLinkedPartsMax.ToString() + " linked prims";
146 return false; 146 return false;