*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, 20 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 685ed8c..46768d5 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -19,9 +19,15 @@ namespace OpenSim.Region.Environment.Scenes
         public delegate void OnRemovePresenceDelegate(LLUUID uuid);

         public event OnRemovePresenceDelegate OnRemovePresence;

 

+        public delegate void OnParcelPrimCountTaintedDelegate();

+        public event OnParcelPrimCountTaintedDelegate OnParcelPrimCountTainted;

+

         public delegate void OnParcelPrimCountUpdateDelegate();

         public event OnParcelPrimCountUpdateDelegate OnParcelPrimCountUpdate;

 

+        public delegate void OnParcelPrimCountAddDelegate(SceneObject obj);

+        public event OnParcelPrimCountAddDelegate OnParcelPrimCountAdd;

+

         public void TriggerOnFrame()

         {

             if (OnFrame != null)

@@ -52,6 +58,13 @@ namespace OpenSim.Region.Environment.Scenes
             }

         }

 

+        public void TriggerParcelPrimCountTainted()

+        {

+            if (OnParcelPrimCountTainted != null)

+            {

+                OnParcelPrimCountTainted();

+            }

+        }

         public void TriggerParcelPrimCountUpdate()

         {

             if (OnParcelPrimCountUpdate != null)

@@ -59,5 +72,12 @@ namespace OpenSim.Region.Environment.Scenes
                 OnParcelPrimCountUpdate();

             }

         }

+        public void TriggerParcelPrimCountAdd(SceneObject obj)

+        {

+            if (OnParcelPrimCountAdd != null)

+            {

+                OnParcelPrimCountAdd(obj);

+            }

+        }

     }

 }