From e9dbe54ab1217e4310b0e7e014516363237e2a21 Mon Sep 17 00:00:00 2001
From: root
Date: Fri, 15 Jul 2011 20:07:59 +0100
Subject: Fix some local id issues in physics glue

---
 .../Region/Framework/Scenes/SceneObjectGroup.cs    |  4 +--
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 32 ++++++++++++++--------
 2 files changed, 22 insertions(+), 14 deletions(-)

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

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 343a8fd..0fbd746 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1467,13 +1467,13 @@ namespace OpenSim.Region.Framework.Scenes
     
                     newPart.PhysActor
                         = m_scene.PhysicsScene.AddPrimShape(
-                            newPart.LocalId,
                             string.Format("{0}/{1}", newPart.Name, newPart.UUID),
                             pbs,
                             newPart.AbsolutePosition,
                             newPart.Scale,
                             newPart.RotationOffset,
-                            part.PhysActor.IsPhysical);
+                            part.PhysActor.IsPhysical,
+                            newPart.LocalId);
     
                     newPart.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);
                 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index e9571aa..7604510 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1588,17 +1588,23 @@ namespace OpenSim.Region.Framework.Scenes
                 // or flexible
                 if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible))
                 {
-//                    m_log.DebugFormat("[SCENE OBJECT PART]: Creating PhysActor for {0} {1} {2}", Name, LocalId, UUID);
-
-                    PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
-                        LocalId,
-                        string.Format("{0}/{1}", Name, UUID),
-                        Shape,
-                        AbsolutePosition,
-                        Scale,
-                        RotationOffset,
-                        RigidBody);
-
+                    try
+                    {
+                        PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
+                                string.Format("{0}/{1}", Name, UUID),
+                                Shape,
+                                AbsolutePosition,
+                                Scale,
+                                RotationOffset,
+                                RigidBody,
+                                m_localId);
+                        PhysActor.SetMaterial(Material);
+                    }
+                    catch
+                    {
+                        m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom.", m_uuid);
+                        PhysActor = null;
+                    }
                     // Basic Physics returns null..  joy joy joy.
                     if (PhysActor != null)
                     {
@@ -4446,7 +4452,9 @@ namespace OpenSim.Region.Framework.Scenes
                         AbsolutePosition,
                         Scale,
                         RotationOffset,
-                        UsePhysics);
+                        UsePhysics,
+                        m_localId);
+                    PhysActor.SetMaterial(Material);
 
                     pa = PhysActor;
                     if (pa != null)
-- 
cgit v1.1