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

Mantis #7917: regression on prim limits module.

LSLKeyTest
Diva Canto 2016-06-18 22:07:01 -07:00
parent 206faf0218
commit ce7fa728ef
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -5076,7 +5076,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (landData.SimwideArea > 0) if (landData.SimwideArea > 0)
{ {
int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus / 65536L); int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus
/ (long)m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY);
// Never report more than sim total capacity // Never report more than sim total capacity
if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity) if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity)
simulatorCapacity = m_scene.RegionInfo.ObjectCapacity; simulatorCapacity = m_scene.RegionInfo.ObjectCapacity;
@ -5109,6 +5110,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
updateMessage.TotalPrims = pc.Total; updateMessage.TotalPrims = pc.Total;
updateMessage.SimWideTotalPrims = pc.Simulator; updateMessage.SimWideTotalPrims = pc.Simulator;
//m_log.DebugFormat("[YYY]: SimWideMaxPrims={0} OwnerPrims={1} TotalPrims={2} SimWideTotalPrims={3} MaxPrims={4}",
// updateMessage.SimWideMaxPrims, updateMessage.OwnerPrims, updateMessage.TotalPrims, updateMessage.SimWideTotalPrims, updateMessage.MaxPrims);
try try
{ {
IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();

20
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -350,22 +350,6 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
} }
private int GetParcelBasePrimCount()
{
if (overrideParcelMaxPrimCount != null)
{
return overrideParcelMaxPrimCount(this);
}
else
{
// Normal Calculations
int parcelMax = (int)((long)LandData.Area
* (long)m_scene.RegionInfo.ObjectCapacity
/ 65536L);
return parcelMax;
}
}
public int GetSimulatorMaxPrimCount() public int GetSimulatorMaxPrimCount()
{ {
if (overrideSimulatorMaxPrimCount != null) if (overrideSimulatorMaxPrimCount != null)
@ -378,7 +362,7 @@ namespace OpenSim.Region.CoreModules.World.Land
int simMax = (int)( (long)LandData.SimwideArea int simMax = (int)( (long)LandData.SimwideArea
* (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.ObjectCapacity
/ (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) ); / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) );
// m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax); //m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax);
return simMax; return simMax;
} }
} }
@ -416,7 +400,7 @@ namespace OpenSim.Region.CoreModules.World.Land
remote_client.SendLandProperties(seq_id, remote_client.SendLandProperties(seq_id,
snap_selection, request_result, this, snap_selection, request_result, this,
(float)m_scene.RegionInfo.RegionSettings.ObjectBonus, (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
GetParcelBasePrimCount(), GetParcelMaxPrimCount(),
GetSimulatorMaxPrimCount(), regionFlags); GetSimulatorMaxPrimCount(), regionFlags);
} }