diff options
author | Justin Clark-Casey (justincc) | 2011-10-15 02:47:27 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-15 02:47:27 +0100 |
commit | 5ddefc256468e4b394d82a2c4bc69fe28c4b59ea (patch) | |
tree | 5853a46021daeb68dee43b868083f60e41da4f2b /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Restore [Startup] physical_prim flag which can stop any prims being subject t... (diff) | |
download | opensim-SC-5ddefc256468e4b394d82a2c4bc69fe28c4b59ea.zip opensim-SC-5ddefc256468e4b394d82a2c4bc69fe28c4b59ea.tar.gz opensim-SC-5ddefc256468e4b394d82a2c4bc69fe28c4b59ea.tar.bz2 opensim-SC-5ddefc256468e4b394d82a2c4bc69fe28c4b59ea.tar.xz |
remove now redundant m_physical_prim flag from SOP.ApplyPhysics()
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 8ad35d3..b4a178e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1548,15 +1548,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
1548 | /// Apply physics to this part. | 1548 | /// Apply physics to this part. |
1549 | /// </summary> | 1549 | /// </summary> |
1550 | /// <param name="rootObjectFlags"></param> | 1550 | /// <param name="rootObjectFlags"></param> |
1551 | /// <param name="m_physicalPrim"></param> | 1551 | /// <param name="VolumeDetectActive"></param> |
1552 | public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive, bool m_physicalPrim) | 1552 | public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive) |
1553 | { | 1553 | { |
1554 | // m_log.DebugFormat( | 1554 | // m_log.DebugFormat( |
1555 | // "[SCENE OBJECT PART]: Applying physics to {0} {1}, m_physicalPrim {2}", | 1555 | // "[SCENE OBJECT PART]: Applying physics to {0} {1}, m_physicalPrim {2}", |
1556 | // Name, LocalId, UUID, m_physicalPrim); | 1556 | // Name, LocalId, UUID, m_physicalPrim); |
1557 | 1557 | ||
1558 | bool isPhysical = (((rootObjectFlags & (uint) PrimFlags.Physics) != 0) && m_physicalPrim); | 1558 | bool isPhysical = (rootObjectFlags & (uint) PrimFlags.Physics) != 0; |
1559 | bool isPhantom = ((rootObjectFlags & (uint) PrimFlags.Phantom) != 0); | 1559 | bool isPhantom = (rootObjectFlags & (uint) PrimFlags.Phantom) != 0; |
1560 | 1560 | ||
1561 | if (IsJoint()) | 1561 | if (IsJoint()) |
1562 | { | 1562 | { |