OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-12-22 19:52:09 +00:00
parent 0563530bf8
commit 292ab783e4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -333,7 +333,6 @@ namespace OpenSim.Region.Framework.Scenes
if (rot != null) if (rot != null)
sceneObject.UpdateGroupRotationR((Quaternion)rot); sceneObject.UpdateGroupRotationR((Quaternion)rot);
//group.ApplyPhysics(m_physicalPrim);
if (sceneObject.RootPart.PhysActor != null && sceneObject.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero) if (sceneObject.RootPart.PhysActor != null && sceneObject.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero)
{ {
sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false); sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false);

5
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -677,7 +677,7 @@ namespace OpenSim.Region.Framework.Scenes
//m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID);
} }
ApplyPhysics(m_scene.m_physicalPrim); ApplyPhysics();
// Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
// for the same object with very different properties. The caller must schedule the update. // for the same object with very different properties. The caller must schedule the update.
@ -1254,8 +1254,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary> /// <summary>
/// Apply physics to this group /// Apply physics to this group
/// </summary> /// </summary>
/// <param name="m_physicalPrim"></param> public void ApplyPhysics()
public void ApplyPhysics(bool m_physicalPrim)
{ {
// Apply physics to the root prim // Apply physics to the root prim
m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive); m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive);