diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 9fdbc54..cd4bd42 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -348,7 +348,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
348 | if (rot != null) | 348 | if (rot != null) |
349 | sceneObject.UpdateGroupRotationR((Quaternion)rot); | 349 | sceneObject.UpdateGroupRotationR((Quaternion)rot); |
350 | 350 | ||
351 | if (sceneObject.RootPart.PhysActor != null && sceneObject.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero) | 351 | PhysicsActor pa = sceneObject.RootPart.PhysActor; |
352 | if (pa != null && pa.IsPhysical && vel != Vector3.Zero) | ||
352 | { | 353 | { |
353 | sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false); | 354 | sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false); |
354 | sceneObject.Velocity = vel; | 355 | sceneObject.Velocity = vel; |