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/SceneObjectGroup.cs | |
| parent | Restore [Startup] physical_prim flag which can stop any prims being subject t... (diff) | |
| download | opensim-SC_OLD-5ddefc256468e4b394d82a2c4bc69fe28c4b59ea.zip opensim-SC_OLD-5ddefc256468e4b394d82a2c4bc69fe28c4b59ea.tar.gz opensim-SC_OLD-5ddefc256468e4b394d82a2c4bc69fe28c4b59ea.tar.bz2 opensim-SC_OLD-5ddefc256468e4b394d82a2c4bc69fe28c4b59ea.tar.xz | |
remove now redundant m_physical_prim flag from SOP.ApplyPhysics()
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index d983d7f..2d6d4ec 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1251,7 +1251,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1251 | public void ApplyPhysics(bool m_physicalPrim) | 1251 | public void ApplyPhysics(bool m_physicalPrim) |
| 1252 | { | 1252 | { |
| 1253 | // Apply physics to the root prim | 1253 | // Apply physics to the root prim |
| 1254 | m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, m_physicalPrim); | 1254 | m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive); |
| 1255 | 1255 | ||
| 1256 | // Apply physics to child prims | 1256 | // Apply physics to child prims |
| 1257 | SceneObjectPart[] parts = m_parts.GetArray(); | 1257 | SceneObjectPart[] parts = m_parts.GetArray(); |
| @@ -1261,7 +1261,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1261 | { | 1261 | { |
| 1262 | SceneObjectPart part = parts[i]; | 1262 | SceneObjectPart part = parts[i]; |
| 1263 | if (part.LocalId != m_rootPart.LocalId) | 1263 | if (part.LocalId != m_rootPart.LocalId) |
| 1264 | part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim); | 1264 | part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive); |
| 1265 | } | 1265 | } |
| 1266 | 1266 | ||
| 1267 | // Hack to get the physics scene geometries in the right spot | 1267 | // Hack to get the physics scene geometries in the right spot |