From d06c85ea77f76f4d915081ed6b314d66d6d38fbf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 13 Jul 2013 00:29:07 +0100
Subject: Reinsert PhysicsActor variable back into
 SOP.SubscribeForCollisionEvents() in order to avoid a race condition.

A separate PhysicsActor variable is used in case some other thread removes the PhysicsActor whilst this code is executing.
If this is now impossible please revert - just adding this now whilst I remember.
Also makes method comment into proper method doc.
---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 830fe31..eb3af42 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4272,10 +4272,14 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat("[SCENE OBJECT PART]: Updated PrimFlags on {0} {1} to {2}", Name, LocalId, Flags);
         }
 
-        // Subscribe for physics collision events if needed for scripts and sounds
+        /// <summary>
+        /// Subscribe for physics collision events if needed for scripts and sounds
+        /// </summary>
         public void SubscribeForCollisionEvents()
         {
-            if (PhysActor != null)
+            PhysicsActor pa = PhysActor;
+
+            if (pa != null)
             {
                 if (
                     ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
@@ -4293,20 +4297,20 @@ namespace OpenSim.Region.Framework.Scenes
                     (CollisionSound != UUID.Zero)
                     )
                 {
-                    if (!PhysActor.SubscribedEvents())
+                    if (!pa.SubscribedEvents())
                     {
                         // If not already subscribed for event, set up for a collision event.
-                        PhysActor.OnCollisionUpdate += PhysicsCollision;
-                        PhysActor.SubscribeEvents(1000);
+                        pa.OnCollisionUpdate += PhysicsCollision;
+                        pa.SubscribeEvents(1000);
                     }
                 }
                 else
                 {
                     // There is no need to be subscribed to collisions so, if subscribed, remove subscription
-                    if (PhysActor.SubscribedEvents())
+                    if (pa.SubscribedEvents())
                     {
-                        PhysActor.OnCollisionUpdate -= PhysicsCollision;
-                        PhysActor.UnSubscribeEvents();
+                        pa.OnCollisionUpdate -= PhysicsCollision;
+                        pa.UnSubscribeEvents();
                     }
                 }
             }
-- 
cgit v1.1