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

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

2 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/Examples/SimpleApp/MySceneObject.cs b/OpenSim/Region/Examples/SimpleApp/MySceneObject.cs
index 1218dac..aab52cc 100644
--- a/OpenSim/Region/Examples/SimpleApp/MySceneObject.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MySceneObject.cs
@@ -13,8 +13,8 @@ namespace SimpleApp
     {

         private PerformanceCounter m_counter;

         

-        public MySceneObject(Scene world, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape)

-            : base(world, ownerID, localID, pos, shape )

+        public MySceneObject(Scene world, EventManager eventManager, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape)

+            : base(world, eventManager, ownerID, localID, pos, shape )

         {

             String objectName = "Processor";

             String counterName = "% Processor Time";

diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 42a7add..ce60512 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -75,7 +75,7 @@ namespace SimpleApp
             shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);

             LLVector3 pos = new LLVector3(129, 129, 27);

 

-            m_sceneObject = new MySceneObject(world, LLUUID.Zero, world.PrimIDAllocate(), pos, shape);

+            m_sceneObject = new MySceneObject(world,world.EventManager, LLUUID.Zero, world.PrimIDAllocate(), pos, shape);

             world.AddNewEntity(m_sceneObject);            

             

             m_log.WriteLine(LogPriority.NORMAL, "Press enter to quit.");