*Added support for simwide area and simwide prim count for parcels

3 files changed, 55 insertions, 6 deletions

diff --git a/OpenSim/Framework/General/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs
index 2d332f5..80b9b64 100644
--- a/OpenSim/Framework/General/Types/ParcelData.cs
+++ b/OpenSim/Framework/General/Types/ParcelData.cs
@@ -46,9 +46,11 @@ namespace OpenSim.Framework.Types
             public int claimDate = 0; //Unemplemented

             public int claimPrice = 0; //Unemplemented

             public LLUUID groupID = new LLUUID(); //Unemplemented

-            public int groupPrims = 0; //Unemplemented

-            public int otherPrims = 0; //Unemplemented

-            public int ownerPrims = 0; //Unemplemented

+            public int groupPrims = 0;

+            public int otherPrims = 0;

+            public int ownerPrims = 0;

+            public int simwidePrims = 0;

+            public int simwideArea = 0;

             public int salePrice = 0; //Unemeplemented. Parcels price.

             public Parcel.ParcelStatus parcelStatus = Parcel.ParcelStatus.Leased;

             public uint parcelFlags = (uint)Parcel.ParcelFlags.AllowFly | (uint)Parcel.ParcelFlags.AllowLandmark | (uint)Parcel.ParcelFlags.AllowAllObjectEntry | (uint)Parcel.ParcelFlags.AllowDeedToGroup | (uint)Parcel.ParcelFlags.AllowTerraform | (uint)Parcel.ParcelFlags.CreateObjects | (uint)Parcel.ParcelFlags.AllowOtherScripts;

diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 981898f..28bfd4c 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -548,6 +548,45 @@ namespace OpenSim.Region.Environment
         {

             this.parcelPrimCountTainted = true;

         }

+

+

+

+        public void finalizeParcelPrimCountUpdate()

+        {

+            //Get Simwide prim count for owner

+            Dictionary<LLUUID, List<Parcel>> parcelOwnersAndParcels = new Dictionary<LLUUID,List<Parcel>>();

+            foreach (Parcel p in parcelList.Values)

+            {

+                if(!parcelOwnersAndParcels.ContainsKey(p.parcelData.ownerID))

+                {

+                    List<Parcel> tempList = new List<Parcel>();

+                    tempList.Add(p);

+                    parcelOwnersAndParcels.Add(p.parcelData.ownerID,tempList);

+                }

+                else

+                {

+                    parcelOwnersAndParcels[p.parcelData.ownerID].Add(p);

+                }

+            }

+

+            foreach (LLUUID owner in parcelOwnersAndParcels.Keys)

+            {

+                int simArea = 0;

+                int simPrims = 0;

+                foreach (Parcel p in parcelOwnersAndParcels[owner])

+                {

+                    simArea += p.parcelData.area;

+                    simPrims += p.parcelData.ownerPrims + p.parcelData.otherPrims + p.parcelData.groupPrims;

+                }

+

+                foreach (Parcel p in parcelOwnersAndParcels[owner])

+                {

+                    p.parcelData.simwideArea = simArea;

+                    p.parcelData.simwidePrims = simPrims;

+                }

+            }

+

+        }

         #endregion

     }

     #endregion

@@ -670,8 +709,15 @@ namespace OpenSim.Region.Environment
             updatePacket.ParcelData.SelectedPrims = 0; //unemeplemented

             updatePacket.ParcelData.SelfCount = 0;//unemplemented

             updatePacket.ParcelData.SequenceID = sequence_id;

-            updatePacket.ParcelData.SimWideMaxPrims = 15000; //unemplemented

-            updatePacket.ParcelData.SimWideTotalPrims = 0; //unemplemented

+            if (parcelData.simwideArea > 0)

+            {

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

+            }

+            else

+            {

+                updatePacket.ParcelData.SimWideMaxPrims = 0;

+            }

+            updatePacket.ParcelData.SimWideTotalPrims = parcelData.simwidePrims;

             updatePacket.ParcelData.SnapSelection = snap_selection;

             updatePacket.ParcelData.SnapshotID = parcelData.snapshotID;

             updatePacket.ParcelData.Status = (byte)parcelData.parcelStatus;

@@ -1003,6 +1049,7 @@ namespace OpenSim.Region.Environment
             }

         }

 

+

         #endregion

 

 

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 13a8c89..9565c02 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -146,7 +146,6 @@ namespace OpenSim.Region.Environment.Scenes
 

             ScenePresence.LoadAnims();

 

-            this.performParcelPrimCountUpdate();

             this.httpListener = httpServer;

         }

         #endregion

@@ -827,6 +826,7 @@ namespace OpenSim.Region.Environment.Scenes
         {

             m_parcelManager.resetAllParcelPrimCounts();

             m_eventManager.TriggerParcelPrimCountUpdate();

+            m_parcelManager.finalizeParcelPrimCountUpdate();

             m_parcelManager.parcelPrimCountTainted = false;

         }

         #endregion