aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs27
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
2 files changed, 2 insertions, 27 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 5b47fc0..ca6b5cb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2181,20 +2181,6 @@ namespace OpenSim.Region.Framework.Scenes
2181 } 2181 }
2182 } 2182 }
2183 2183
2184 public void applyAngularImpulse(Vector3 impulse)
2185 {
2186 PhysicsActor pa = RootPart.PhysActor;
2187
2188 if (pa != null)
2189 {
2190 if (!IsAttachment)
2191 {
2192 pa.AddAngularForce(impulse, true);
2193 m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
2194 }
2195 }
2196 }
2197
2198 public void setAngularImpulse(Vector3 impulse) 2184 public void setAngularImpulse(Vector3 impulse)
2199 { 2185 {
2200 PhysicsActor pa = RootPart.PhysActor; 2186 PhysicsActor pa = RootPart.PhysActor;
@@ -2211,18 +2197,7 @@ namespace OpenSim.Region.Framework.Scenes
2211 2197
2212 public Vector3 GetTorque() 2198 public Vector3 GetTorque()
2213 { 2199 {
2214 PhysicsActor pa = RootPart.PhysActor; 2200 return Torque;
2215
2216 if (pa != null)
2217 {
2218 if (!IsAttachment)
2219 {
2220 Vector3 torque = pa.Torque;
2221 return torque;
2222 }
2223 }
2224
2225 return Vector3.Zero;
2226 } 2201 }
2227 2202
2228 // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object 2203 // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 83b0b18..9ba3e92 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1803,7 +1803,7 @@ namespace OpenSim.Region.Framework.Scenes
1803 impulse = newimpulse; 1803 impulse = newimpulse;
1804 } 1804 }
1805 1805
1806 ParentGroup.applyAngularImpulse(impulse); 1806 ParentGroup.setAngularImpulse(impulse);
1807 } 1807 }
1808 1808
1809 /// <summary> 1809 /// <summary>