aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs6
2 files changed, 6 insertions, 3 deletions
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
1767 part.AbsolutePosition, 1767 part.AbsolutePosition,
1768 part.Scale, 1768 part.Scale,
1769 part.RotationOffset, 1769 part.RotationOffset,
1770 part.PhysActor.IsPhysical); 1770 part.PhysActor.IsPhysical,
1771 m_localId);
1771 part.PhysActor.SetMaterial((int)part.Material); 1772 part.PhysActor.SetMaterial((int)part.Material);
1772 1773
1773 part.PhysActor.LocalID = part.LocalId; 1774 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
1633 AbsolutePosition, 1633 AbsolutePosition,
1634 Scale, 1634 Scale,
1635 RotationOffset, 1635 RotationOffset,
1636 RigidBody); 1636 RigidBody,
1637 m_localId);
1637 PhysActor.SetMaterial(Material); 1638 PhysActor.SetMaterial(Material);
1638 } 1639 }
1639 catch 1640 catch
@@ -4442,7 +4443,8 @@ namespace OpenSim.Region.Framework.Scenes
4442 AbsolutePosition, 4443 AbsolutePosition,
4443 Scale, 4444 Scale,
4444 RotationOffset, 4445 RotationOffset,
4445 UsePhysics); 4446 UsePhysics,
4447 m_localId);
4446 PhysActor.SetMaterial(Material); 4448 PhysActor.SetMaterial(Material);
4447 4449
4448 pa = PhysActor; 4450 pa = PhysActor;