From 6b65eb76d0a664a582f10ac105733d3cdc2b4897 Mon Sep 17 00:00:00 2001
From: Kitto Flora
Date: Wed, 30 Sep 2009 19:01:55 +0200
Subject: Another small change to avoid later merge conflict

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b284ed4..203faed 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3410,7 +3410,8 @@ if (m_shape != null) {
             {
                 RemFlag(PrimFlags.Phantom);
 
-                if (PhysActor == null)
+                PhysicsActor pa = PhysActor;
+                if (pa == null)
                 {
                     // It's not phantom anymore. So make sure the physics engine get's knowledge of it
                     PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
@@ -3421,7 +3422,7 @@ if (m_shape != null) {
                         RotationOffset,
                         UsePhysics);
 
-                    PhysicsActor pa = PhysActor;
+                    pa = PhysActor;
                     if (pa != null)
                     {
                         pa.LocalID = LocalId;
-- 
cgit v1.1