From f5623b5c3903606606fedead8f365244c0eddbed Mon Sep 17 00:00:00 2001
From: Tom
Date: Tue, 19 Jul 2011 10:15:34 -0700
Subject: Tidy up a superfluous AddPrimShape override in PhysicsScene

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2214f2f..037f384 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4437,7 +4437,6 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     // It's not phantom anymore. So make sure the physics engine get's knowledge of it
                     PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
-                        LocalId,
                         string.Format("{0}/{1}", Name, UUID),
                         Shape,
                         AbsolutePosition,
-- 
cgit v1.1


From c768d18c92d145427eb1b1679894f082b0bed7a5 Mon Sep 17 00:00:00 2001
From: root
Date: Tue, 19 Jul 2011 18:16:36 +0100
Subject: Revert "Tidy up a superfluous AddPrimShape override in PhysicsScene"

This reverts commit f5623b5c3903606606fedead8f365244c0eddbed.
---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 037f384..2214f2f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4437,6 +4437,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     // It's not phantom anymore. So make sure the physics engine get's knowledge of it
                     PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
+                        LocalId,
                         string.Format("{0}/{1}", Name, UUID),
                         Shape,
                         AbsolutePosition,
-- 
cgit v1.1


From cbaa4aa88fd45df70003176254579492f11e0d5a Mon Sep 17 00:00:00 2001
From: Careminster Team
Date: Tue, 19 Jul 2011 10:15:34 -0700
Subject: Tidy up a superfluous AddPrimShape override in PhysicsScene

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2214f2f..037f384 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4437,7 +4437,6 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     // It's not phantom anymore. So make sure the physics engine get's knowledge of it
                     PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
-                        LocalId,
                         string.Format("{0}/{1}", Name, UUID),
                         Shape,
                         AbsolutePosition,
-- 
cgit v1.1