* Lock timers when Calling Start() and Stop() when the Thread Context is murky. This affects Mono only.

2 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index f8208ec..7ac1e7e 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -78,7 +78,8 @@ namespace OpenSim.Region.Framework.Scenes
                 bool permissionToDelete)
         {
             if (Enabled)
-                m_inventoryTicker.Stop();
+                lock (m_inventoryTicker)
+                    m_inventoryTicker.Stop();
 
             lock (m_inventoryDeletes)
             {
@@ -93,7 +94,8 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             if (Enabled)
-                m_inventoryTicker.Start();
+                lock (m_inventoryTicker)
+                    m_inventoryTicker.Start();
         
             // Visually remove it, even if it isnt really gone yet.  This means that if we crash before the object
             // has gone to inventory, it will reappear in the region again on restart instead of being lost.
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 40e7471..b0d279c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3762,6 +3762,8 @@ if (m_shape != null) {
                     lPos = AbsolutePosition;
             }
 
+            // Causes this thread to dig into the Client Thread Data.
+            // Remember your locking here!
             remoteClient.SendPrimTerseUpdate(m_regionHandle,
                     (ushort)(m_parentGroup.GetTimeDilation() *
                     (float)ushort.MaxValue), LocalId, lPos,