aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2010-12-15 17:54:57 +0100
committerMelanie2010-12-15 17:54:57 +0100
commit62e66b17bcc6e9dd856a0d46b3097f452d865a3b (patch)
treef93fe4922feaf3e89edae9ea2ac142968c607acd /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-62e66b17bcc6e9dd856a0d46b3097f452d865a3b.zip
opensim-SC_OLD-62e66b17bcc6e9dd856a0d46b3097f452d865a3b.tar.gz
opensim-SC_OLD-62e66b17bcc6e9dd856a0d46b3097f452d865a3b.tar.bz2
opensim-SC_OLD-62e66b17bcc6e9dd856a0d46b3097f452d865a3b.tar.xz
Make sure the material is set on physical prims
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
1 files changed, 2 insertions, 0 deletions
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
1608 Scale, 1608 Scale,
1609 RotationOffset, 1609 RotationOffset,
1610 RigidBody); 1610 RigidBody);
1611 PhysActor.SetMaterial(Material);
1611 } 1612 }
1612 catch 1613 catch
1613 { 1614 {
@@ -4432,6 +4433,7 @@ namespace OpenSim.Region.Framework.Scenes
4432 Scale, 4433 Scale,
4433 RotationOffset, 4434 RotationOffset,
4434 UsePhysics); 4435 UsePhysics);
4436 PhysActor.SetMaterial(Material);
4435 4437
4436 pa = PhysActor; 4438 pa = PhysActor;
4437 if (pa != null) 4439 if (pa != null)