From e480e25d8bee9180c4421834df0d898171d4c3f1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Apr 2012 06:01:05 +0100
Subject: Fix more SOP.PhysActor race conditions in LSL_Api

---
 .../Shared/Api/Implementation/LSL_Api.cs           | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b502ab8..8d25a62 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1362,7 +1362,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (scale.z < 0.01)
                 scale.z = 0.01;
 
-            if (part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical)
+            PhysicsActor pa = part.ParentGroup.RootPart.PhysActor;
+
+            if (pa != null && pa.IsPhysical)
             {
                 if (scale.x > World.m_maxPhys)
                     scale.x = World.m_maxPhys;
@@ -2088,7 +2090,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // but only if the object is not physial and active.   This is important for rotating doors.
             // without the absoluteposition = absoluteposition happening, the doors do not move in the physics
             // scene
-            if (part.PhysActor != null && !part.PhysActor.IsPhysical)
+            PhysicsActor pa = part.PhysActor;
+
+            if (pa != null && !pa.IsPhysical)
             {
                 part.ParentGroup.ResetChildPrimPhysicsPositions();
             }
@@ -2819,7 +2823,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         float groupmass = new_group.GetMass();
 
-                        if (new_group.RootPart.PhysActor != null && new_group.RootPart.PhysActor.IsPhysical && llvel != Vector3.Zero)
+                        PhysicsActor pa = new_group.RootPart.PhysActor;
+
+                        if (pa != null && pa.IsPhysical && llvel != Vector3.Zero)
                         {
                             //Recoil.
                             llApplyImpulse(new LSL_Vector(llvel.X * groupmass, llvel.Y * groupmass, llvel.Z * groupmass), 0);
@@ -2860,12 +2866,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             // we need to convert from a vector describing
             // the angles of rotation in radians into rotation value
-
             LSL_Rotation rot = llEuler2Rot(angle);
             
             // Per discussion with Melanie, for non-physical objects llLookAt appears to simply
             // set the rotation of the object, copy that behavior
-            if (strength == 0 || m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
+            PhysicsActor pa = m_host.PhysActor;
+
+            if (strength == 0 || pa == null || !pa.IsPhysical)
             {
                 llSetRot(rot);
             }
@@ -3201,6 +3208,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetHoverHeight(double height, int water, double tau)
         {
             m_host.AddScriptLPS(1);
+
             if (m_host.PhysActor != null)
             {
                 PIDHoverType hoverType = PIDHoverType.Ground;
@@ -3251,7 +3259,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             
             // Per discussion with Melanie, for non-physical objects llLookAt appears to simply
             // set the rotation of the object, copy that behavior
-            if (strength == 0 || m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
+            PhysicsActor pa = m_host.PhysActor;
+
+            if (strength == 0 || pa == null || !pa.IsPhysical)
             {
                 llSetLocalRot(target);
             }
@@ -10728,7 +10738,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if (entity is SceneObjectPart)
                 {
-                    if (((SceneObjectPart)entity).PhysActor != null && ((SceneObjectPart)entity).PhysActor.IsPhysical)
+                    PhysicsActor pa = ((SceneObjectPart)entity).PhysActor;
+
+                    if (pa != null && pa.IsPhysical)
                     {
                         if (!checkPhysical)
                             continue;
-- 
cgit v1.1