From c7dbd7cbd035ccc412624cd221348479d43798d6 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 15 Jul 2011 12:08:40 -0700
Subject: Fox some local id issues in physics glue

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 3 ++-
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 482597d..aeb03a2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1767,7 +1767,8 @@ namespace OpenSim.Region.Framework.Scenes
                                 part.AbsolutePosition,
                                 part.Scale,
                                 part.RotationOffset,
-                                part.PhysActor.IsPhysical);
+                                part.PhysActor.IsPhysical,
+                                m_localId);
                         part.PhysActor.SetMaterial((int)part.Material);
         
                         part.PhysActor.LocalID = part.LocalId;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 980f7a3..2214f2f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1633,7 +1633,8 @@ namespace OpenSim.Region.Framework.Scenes
                                 AbsolutePosition,
                                 Scale,
                                 RotationOffset,
-                                RigidBody);
+                                RigidBody,
+                                m_localId);
                         PhysActor.SetMaterial(Material);
                     }
                     catch
@@ -4442,7 +4443,8 @@ namespace OpenSim.Region.Framework.Scenes
                         AbsolutePosition,
                         Scale,
                         RotationOffset,
-                        UsePhysics);
+                        UsePhysics,
+                        m_localId);
                     PhysActor.SetMaterial(Material);
 
                     pa = PhysActor;
-- 
cgit v1.1