diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 4afceab..45ad022 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -350,22 +350,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
350 | } | 350 | } |
351 | } | 351 | } |
352 | 352 | ||
353 | private int GetParcelBasePrimCount() | ||
354 | { | ||
355 | if (overrideParcelMaxPrimCount != null) | ||
356 | { | ||
357 | return overrideParcelMaxPrimCount(this); | ||
358 | } | ||
359 | else | ||
360 | { | ||
361 | // Normal Calculations | ||
362 | int parcelMax = (int)((long)LandData.Area | ||
363 | * (long)m_scene.RegionInfo.ObjectCapacity | ||
364 | / 65536L); | ||
365 | return parcelMax; | ||
366 | } | ||
367 | } | ||
368 | |||
369 | public int GetSimulatorMaxPrimCount() | 353 | public int GetSimulatorMaxPrimCount() |
370 | { | 354 | { |
371 | if (overrideSimulatorMaxPrimCount != null) | 355 | if (overrideSimulatorMaxPrimCount != null) |
@@ -378,7 +362,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
378 | int simMax = (int)( (long)LandData.SimwideArea | 362 | int simMax = (int)( (long)LandData.SimwideArea |
379 | * (long)m_scene.RegionInfo.ObjectCapacity | 363 | * (long)m_scene.RegionInfo.ObjectCapacity |
380 | / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) ); | 364 | / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) ); |
381 | // m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax); | 365 | //m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax); |
382 | return simMax; | 366 | return simMax; |
383 | } | 367 | } |
384 | } | 368 | } |
@@ -416,7 +400,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
416 | remote_client.SendLandProperties(seq_id, | 400 | remote_client.SendLandProperties(seq_id, |
417 | snap_selection, request_result, this, | 401 | snap_selection, request_result, this, |
418 | (float)m_scene.RegionInfo.RegionSettings.ObjectBonus, | 402 | (float)m_scene.RegionInfo.RegionSettings.ObjectBonus, |
419 | GetParcelBasePrimCount(), | 403 | GetParcelMaxPrimCount(), |
420 | GetSimulatorMaxPrimCount(), regionFlags); | 404 | GetSimulatorMaxPrimCount(), regionFlags); |
421 | } | 405 | } |
422 | 406 | ||