From 12b73603cc4605955d9ea60ad66b4a85ea3d44ca Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 19 Jun 2016 09:17:04 -0700
Subject: 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.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

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
             
             if (landData.SimwideArea > 0)
             {
-                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
-                if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity)
-                    simulatorCapacity = m_scene.RegionInfo.ObjectCapacity;
-                updateMessage.SimWideMaxPrims = simulatorCapacity; 
+                updateMessage.SimWideMaxPrims = lo.GetSimulatorMaxPrimCount();
             }
             else
             {
-- 
cgit v1.1