*Removed ParcelManager from SceneObject and Primitive and replaced with events in EventManager

*Prim count and sim-wide prim count correctly reflect object bonus multiplier

1 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 28bfd4c..3603caa 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -683,7 +683,14 @@ namespace OpenSim.Region.Environment
             updatePacket.ParcelData.IsGroupOwned = parcelData.isGroupOwned;

             updatePacket.ParcelData.LandingType = (byte)parcelData.landingType;

             updatePacket.ParcelData.LocalID = parcelData.localID;

-            updatePacket.ParcelData.MaxPrims = 1000; //unemplemented

+            if (parcelData.area > 0)

+            {

+                updatePacket.ParcelData.MaxPrims = Convert.ToInt32(Math.Round((Convert.ToDecimal(parcelData.area) / Convert.ToDecimal(65536)) * 15000 * Convert.ToDecimal(m_world.RegionInfo.estateSettings.objectBonusFactor)));

+            }

+            else

+            {

+                updatePacket.ParcelData.MaxPrims = 0;

+            }

             updatePacket.ParcelData.MediaAutoScale = parcelData.mediaAutoScale;

             updatePacket.ParcelData.MediaID = parcelData.mediaID;

             updatePacket.ParcelData.MediaURL = Helpers.StringToField(parcelData.mediaURL);

@@ -711,7 +718,7 @@ namespace OpenSim.Region.Environment
             updatePacket.ParcelData.SequenceID = sequence_id;

             if (parcelData.simwideArea > 0)

             {

-                updatePacket.ParcelData.SimWideMaxPrims = Convert.ToInt32(Math.Floor((Convert.ToDecimal(65536) / Convert.ToDecimal(parcelData.simwideArea)) * 15000));

+                updatePacket.ParcelData.SimWideMaxPrims = Convert.ToInt32(Math.Round((Convert.ToDecimal(parcelData.simwideArea) / Convert.ToDecimal(65536)) * 15000 * Convert.ToDecimal(m_world.RegionInfo.estateSettings.objectBonusFactor)));

             }

             else

             {