diff options
author | Diva Canto | 2016-06-19 09:17:04 -0700 |
---|---|---|
committer | Diva Canto | 2016-06-19 09:17:04 -0700 |
commit | 12b73603cc4605955d9ea60ad66b4a85ea3d44ca (patch) | |
tree | 0ccdfed4f2b2db7644fb93225170685aa50866e3 /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |
parent | Mantis #7917: regression on prim limits module. (diff) | |
download | opensim-SC-12b73603cc4605955d9ea60ad66b4a85ea3d44ca.zip opensim-SC-12b73603cc4605955d9ea60ad66b4a85ea3d44ca.tar.gz opensim-SC-12b73603cc4605955d9ea60ad66b4a85ea3d44ca.tar.bz2 opensim-SC-12b73603cc4605955d9ea60ad66b4a85ea3d44ca.tar.xz |
Still related to mantis #7917, parcel prims info. Now sending the correct numbers for "Simulator primitive usage" related to the parcel owner, not the entire region.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index a8778b4..74eb114 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -5076,12 +5076,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5076 | 5076 | ||
5077 | if (landData.SimwideArea > 0) | 5077 | if (landData.SimwideArea > 0) |
5078 | { | 5078 | { |
5079 | int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus | 5079 | updateMessage.SimWideMaxPrims = lo.GetSimulatorMaxPrimCount(); |
5080 | / (long)m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY); | ||
5081 | // Never report more than sim total capacity | ||
5082 | if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity) | ||
5083 | simulatorCapacity = m_scene.RegionInfo.ObjectCapacity; | ||
5084 | updateMessage.SimWideMaxPrims = simulatorCapacity; | ||
5085 | } | 5080 | } |
5086 | else | 5081 | else |
5087 | { | 5082 | { |