OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make mesh upload respect the same parts maximum as what is set for the 

simulator
LSLKeyTest
Melanie Thielker 2016-03-05 22:30:02 +01:00
parent 110297793c
commit 57b6398b71
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -153,6 +153,7 @@ namespace OpenSim.Region.ClientStack.Linden
// tell it about scene object limits // tell it about scene object limits
m_ModelCost.NonPhysicalPrimScaleMax = m_Scene.m_maxNonphys; m_ModelCost.NonPhysicalPrimScaleMax = m_Scene.m_maxNonphys;
m_ModelCost.PhysicalPrimScaleMax = m_Scene.m_maxPhys; m_ModelCost.PhysicalPrimScaleMax = m_Scene.m_maxPhys;
m_ModelCost.ObjectLinkedPartsMax = m_Scene.m_linksetCapacity;
// m_ModelCost.ObjectLinkedPartsMax = ?? // m_ModelCost.ObjectLinkedPartsMax = ??
// m_ModelCost.PrimScaleMin = ?? // m_ModelCost.PrimScaleMin = ??

2
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
View File

@ -140,7 +140,7 @@ namespace OpenSim.Region.ClientStack.Linden
int numberInstances = resources.instance_list.Array.Count; 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"; error = "Model would have more than " + ObjectLinkedPartsMax.ToString() + " linked prims";
return false; return false;