aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
diff options
context:
space:
mode:
authorMelanie2011-07-06 09:59:05 +0200
committerMelanie2011-07-06 09:59:05 +0200
commit06d5989f4d44de2dfedbb3858f706940a56361ed (patch)
treed0c882270a49fe20e9d5c05e9e287269309425fb /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
parentRevert "If a user has the rights to edit a parcel's properties, then also all... (diff)
downloadopensim-SC-06d5989f4d44de2dfedbb3858f706940a56361ed.zip
opensim-SC-06d5989f4d44de2dfedbb3858f706940a56361ed.tar.gz
opensim-SC-06d5989f4d44de2dfedbb3858f706940a56361ed.tar.bz2
opensim-SC-06d5989f4d44de2dfedbb3858f706940a56361ed.tar.xz
Fix parcel prim count and max reporting. Viewer already multiplies.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 6048518..ecf10e4 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4589,7 +4589,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4589 4589
4590 if (landData.SimwideArea > 0) 4590 if (landData.SimwideArea > 0)
4591 { 4591 {
4592 int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus); 4592 int simulatorCapacity = (int)((double)(landData.SimwideArea * m_scene.RegionInfo.ObjectCapacity) * m_scene.RegionInfo.RegionSettings.ObjectBonus) / 65536;
4593 // Never report more than sim total capacity
4594 if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity)
4595 simulatorCapacity = m_scene.RegionInfo.ObjectCapacity;
4593 updateMessage.SimWideMaxPrims = simulatorCapacity; 4596 updateMessage.SimWideMaxPrims = simulatorCapacity;
4594 } 4597 }
4595 else 4598 else