aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2011-10-25 01:54:07 +0100
committerMelanie2011-10-25 01:54:07 +0100
commit3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba (patch)
treeff4233adbe9c2d00787a52c79e90c448e0aa7172 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge (diff)
parentremove now redundant m_physical_prim flag from SOP.ApplyPhysics() (diff)
downloadopensim-SC_OLD-3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba.zip
opensim-SC_OLD-3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba.tar.gz
opensim-SC_OLD-3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba.tar.bz2
opensim-SC_OLD-3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba.tar.xz
Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 5abf9dd..92db8b0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1600,15 +1600,15 @@ namespace OpenSim.Region.Framework.Scenes
1600 /// Apply physics to this part. 1600 /// Apply physics to this part.
1601 /// </summary> 1601 /// </summary>
1602 /// <param name="rootObjectFlags"></param> 1602 /// <param name="rootObjectFlags"></param>
1603 /// <param name="m_physicalPrim"></param> 1603 /// <param name="VolumeDetectActive"></param>
1604 public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive, bool m_physicalPrim) 1604 public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive)
1605 { 1605 {
1606// m_log.DebugFormat( 1606// m_log.DebugFormat(
1607// "[SCENE OBJECT PART]: Applying physics to {0} {1}, m_physicalPrim {2}", 1607// "[SCENE OBJECT PART]: Applying physics to {0} {1}, m_physicalPrim {2}",
1608// Name, LocalId, UUID, m_physicalPrim); 1608// Name, LocalId, UUID, m_physicalPrim);
1609 1609
1610 bool isPhysical = (((rootObjectFlags & (uint) PrimFlags.Physics) != 0) && m_physicalPrim); 1610 bool isPhysical = (rootObjectFlags & (uint) PrimFlags.Physics) != 0;
1611 bool isPhantom = ((rootObjectFlags & (uint) PrimFlags.Phantom) != 0); 1611 bool isPhantom = (rootObjectFlags & (uint) PrimFlags.Phantom) != 0;
1612 1612
1613 if (IsJoint()) 1613 if (IsJoint())
1614 { 1614 {