From 62e66b17bcc6e9dd856a0d46b3097f452d865a3b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 15 Dec 2010 17:54:57 +0100
Subject: Make sure the material is set on physical prims

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

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 896300f..72443b9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1749,6 +1749,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 part.Scale,
                                 part.RotationOffset,
                                 part.PhysActor.IsPhysical);
+                        part.PhysActor.SetMaterial((int)part.Material);
         
                         part.PhysActor.LocalID = part.LocalId;
                         part.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a109d68..0297a39 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1608,6 +1608,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 Scale,
                                 RotationOffset,
                                 RigidBody);
+                        PhysActor.SetMaterial(Material);
                     }
                     catch
                     {
@@ -4432,6 +4433,7 @@ namespace OpenSim.Region.Framework.Scenes
                         Scale,
                         RotationOffset,
                         UsePhysics);
+                    PhysActor.SetMaterial(Material);
 
                     pa = PhysActor;
                     if (pa != null)
-- 
cgit v1.1