* Reverting todays work. It was worth a try.

1 files changed, 10 insertions, 17 deletions

diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs
index a185f0b..6ff66a3 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim.RegionServer/world/Primitive.cs
@@ -22,9 +22,6 @@ namespace OpenSim.world
         private PhysicsActor _physActor;

         private bool physicsEnabled = false;

         private bool physicstest = false; //just added for testing 

-        private Dictionary<uint, SimClient> m_clientThreads;

-        private ulong m_regionHandle;

-        private World m_world;

 

         public bool PhysicsEnabled

         {

@@ -68,14 +65,10 @@ namespace OpenSim.world
             }

         }

 

-        public Primitive(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, World world)

+        public Primitive()

         {

             mesh_cutbegin = 0.0f;

             mesh_cutend = 1.0f;

-            

-            m_clientThreads = clientThreads;

-            m_regionHandle = regionHandle;

-            m_world = world;

         }

 

         public override Mesh getMesh()

@@ -106,7 +99,7 @@ namespace OpenSim.world
         {

             if (this.newPrimFlag)

             {

-                foreach (SimClient client in m_clientThreads.Values)

+                foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values)

                 {

                     client.OutPacket(OurPacket);

                 }

@@ -115,11 +108,11 @@ namespace OpenSim.world
             else if (this.updateFlag)

             {

                 ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();

-                terse.RegionData.RegionHandle = m_regionHandle; // FIXME

+                terse.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; // FIXME

                 terse.RegionData.TimeDilation = 64096;

                 terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];

                 terse.ObjectData[0] = this.CreateImprovedBlock();

-                foreach (SimClient client in m_clientThreads.Values)

+                foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values)

                 {

                     client.OutPacket(terse);

                 }

@@ -127,7 +120,7 @@ namespace OpenSim.world
             }

             else if (this.dirtyFlag)

             {

-                foreach (SimClient client in m_clientThreads.Values)

+                foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values)

                 {

                     UpdateClient(client);

                 }

@@ -138,11 +131,11 @@ namespace OpenSim.world
                 if (this._physActor != null && this.physicsEnabled)

                 {

                     ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();

-                    terse.RegionData.RegionHandle = m_regionHandle; // FIXME

+                    terse.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle; // FIXME

                     terse.RegionData.TimeDilation = 64096;

                     terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];

                     terse.ObjectData[0] = this.CreateImprovedBlock();

-                    foreach (SimClient client in m_clientThreads.Values)

+                    foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values)

                     {

                         client.OutPacket(terse);

                     }

@@ -262,7 +255,7 @@ namespace OpenSim.world
         public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)

         {

             ObjectUpdatePacket objupdate = new ObjectUpdatePacket();

-            objupdate.RegionData.RegionHandle = m_regionHandle;

+            objupdate.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle;

             objupdate.RegionData.TimeDilation = 64096;

 

             objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];

@@ -330,7 +323,7 @@ namespace OpenSim.world
         {

             //need to clean this up as it shares a lot of code with CreateFromPacket()

             ObjectUpdatePacket objupdate = new ObjectUpdatePacket();

-            objupdate.RegionData.RegionHandle = m_regionHandle;

+            objupdate.RegionData.RegionHandle = OpenSimRoot.Instance.Cfg.RegionHandle;

             objupdate.RegionData.TimeDilation = 64096;

             objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];

 

@@ -487,7 +480,7 @@ namespace OpenSim.world
             this.primData.LocalID = this.localid;

             this.primData.Position = this.position;

             this.primData.Rotation = new LLQuaternion(this.rotation.x, this.rotation.y, this.rotation.z, this.rotation.w);

-            m_world.localStorage.StorePrim(this.primData);

+            OpenSimRoot.Instance.LocalWorld.localStorage.StorePrim(this.primData);

         }

     }