diff options
author | Melanie | 2012-02-21 10:10:04 +0100 |
---|---|---|
committer | Melanie | 2012-02-21 10:10:04 +0100 |
commit | 0e4d5a4d3ce54530f39d513146b066a55769d231 (patch) | |
tree | 27f84a18f0408c01b807539e6be2293f0d742f70 | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-0e4d5a4d3ce54530f39d513146b066a55769d231.zip opensim-SC-0e4d5a4d3ce54530f39d513146b066a55769d231.tar.gz opensim-SC-0e4d5a4d3ce54530f39d513146b066a55769d231.tar.bz2 opensim-SC-0e4d5a4d3ce54530f39d513146b066a55769d231.tar.xz |
Also preserve angular velocity on crossing.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index d32b20a..dd9431b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1540,6 +1540,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1540 | if (!isPhantom && !ParentGroup.IsAttachment && !(Shape.PathCurve == (byte)Extrusion.Flexible)) | 1540 | if (!isPhantom && !ParentGroup.IsAttachment && !(Shape.PathCurve == (byte)Extrusion.Flexible)) |
1541 | { | 1541 | { |
1542 | Vector3 velocity = Velocity; | 1542 | Vector3 velocity = Velocity; |
1543 | Vector3 rotationalVelocity = AngularVelocity; | ||
1543 | try | 1544 | try |
1544 | { | 1545 | { |
1545 | PhysActor = ParentGroup.Scene.PhysicsScene.AddPrimShape( | 1546 | PhysActor = ParentGroup.Scene.PhysicsScene.AddPrimShape( |
@@ -1572,7 +1573,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1572 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); | 1573 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); |
1573 | 1574 | ||
1574 | Velocity = velocity; | 1575 | Velocity = velocity; |
1576 | AngularVelocity = rotationalVelocity; | ||
1575 | PhysActor.Velocity = velocity; | 1577 | PhysActor.Velocity = velocity; |
1578 | PhysActor.RotationalVelocity = rotationalVelocity; | ||
1576 | 1579 | ||
1577 | if (!building) | 1580 | if (!building) |
1578 | PhysActor.Building = false; | 1581 | PhysActor.Building = false; |