aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 05c9924..8ad35d3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1551,7 +1551,9 @@ namespace OpenSim.Region.Framework.Scenes
1551 /// <param name="m_physicalPrim"></param> 1551 /// <param name="m_physicalPrim"></param>
1552 public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive, bool m_physicalPrim) 1552 public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive, bool m_physicalPrim)
1553 { 1553 {
1554// m_log.DebugFormat("[SCENE OBJECT PART]: Applying physics to {0} {1} {2}", Name, LocalId, UUID); 1554// m_log.DebugFormat(
1555// "[SCENE OBJECT PART]: Applying physics to {0} {1}, m_physicalPrim {2}",
1556// Name, LocalId, UUID, m_physicalPrim);
1555 1557
1556 bool isPhysical = (((rootObjectFlags & (uint) PrimFlags.Physics) != 0) && m_physicalPrim); 1558 bool isPhysical = (((rootObjectFlags & (uint) PrimFlags.Physics) != 0) && m_physicalPrim);
1557 bool isPhantom = ((rootObjectFlags & (uint) PrimFlags.Phantom) != 0); 1559 bool isPhantom = ((rootObjectFlags & (uint) PrimFlags.Phantom) != 0);
@@ -1816,6 +1818,9 @@ namespace OpenSim.Region.Framework.Scenes
1816 /// <param name="isNew"></param> 1818 /// <param name="isNew"></param>
1817 public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew) 1819 public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew)
1818 { 1820 {
1821 if (!ParentGroup.Scene.m_physicalPrim && UsePhysics)
1822 return;
1823
1819 if (IsJoint()) 1824 if (IsJoint())
1820 { 1825 {
1821 DoPhysicsPropertyUpdateForNinjaJoint(UsePhysics, isNew); 1826 DoPhysicsPropertyUpdateForNinjaJoint(UsePhysics, isNew);