From 17b1454d6f3b45618b1007c85fe97242284aff3c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 6 Mar 2012 20:20:12 +0100
Subject: Null PhysActor on SOP.Copy() to prevent clobbering the original one

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

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b132a19..9c06786 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1691,10 +1691,9 @@ namespace OpenSim.Region.Framework.Scenes
             if (userExposed)
                 dupe.UUID = UUID.Random();
 
-            //memberwiseclone means it also clones the physics actor reference
-            // This will make physical prim 'bounce' if not set to null.
-            if (!userExposed)
-                dupe.PhysActor = null;
+            // The PhysActor cannot be valid on a copy because the copy is not in the scene yet.
+            // Null it, the caller has to create a new one once the object is added to a scene
+            dupe.PhysActor = null;
 
             dupe.OwnerID = AgentID;
             dupe.GroupID = GroupID;
-- 
cgit v1.1