diff options
author | UbitUmarov | 2012-04-04 16:38:29 +0100 |
---|---|---|
committer | UbitUmarov | 2012-04-04 16:38:29 +0100 |
commit | 787cc0d076f0a56cf48dbef4475ec991da00adf0 (patch) | |
tree | a7fe0703f42f598520bbb91d334a02e78f359ac1 /OpenSim | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
download | opensim-SC-787cc0d076f0a56cf48dbef4475ec991da00adf0.zip opensim-SC-787cc0d076f0a56cf48dbef4475ec991da00adf0.tar.gz opensim-SC-787cc0d076f0a56cf48dbef4475ec991da00adf0.tar.bz2 opensim-SC-787cc0d076f0a56cf48dbef4475ec991da00adf0.tar.xz |
reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This functions naming is misleading, Here Apply means to apply a instante impulse that may add to previus unprocessed ones and not setting a permanente torque (that is done by llSetTorque).
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 5f33452..54e8d50 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2181,7 +2181,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2181 | } | 2181 | } |
2182 | } | 2182 | } |
2183 | 2183 | ||
2184 | public void setAngularImpulse(Vector3 impulse) | 2184 | public void ApplyAngularImpulse(Vector3 impulse) |
2185 | { | 2185 | { |
2186 | PhysicsActor pa = RootPart.PhysActor; | 2186 | PhysicsActor pa = RootPart.PhysActor; |
2187 | 2187 | ||
@@ -2189,7 +2189,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2189 | { | 2189 | { |
2190 | if (!IsAttachment) | 2190 | if (!IsAttachment) |
2191 | { | 2191 | { |
2192 | pa.Torque = impulse; | 2192 | pa.AddAngularForce(impulse, true); |
2193 | m_scene.PhysicsScene.AddPhysicsActorTaint(pa); | 2193 | m_scene.PhysicsScene.AddPhysicsActorTaint(pa); |
2194 | } | 2194 | } |
2195 | } | 2195 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index aed25a7..f091a91 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1789,7 +1789,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1789 | impulse = newimpulse; | 1789 | impulse = newimpulse; |
1790 | } | 1790 | } |
1791 | 1791 | ||
1792 | ParentGroup.setAngularImpulse(impulse); | 1792 | ParentGroup.ApplyAngularImpulse(impulse); |
1793 | } | 1793 | } |
1794 | 1794 | ||
1795 | /// <summary> | 1795 | /// <summary> |