diff options
author | Justin Clark-Casey (justincc) | 2011-09-01 01:37:35 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-01 01:37:35 +0100 |
commit | 63bf71023772ea9c54687c5006fcf6649eb1139f (patch) | |
tree | d4d21757512d104df22423beb6d96c1d9cc105c0 /OpenSim/Region | |
parent | Remove pointless cluttering SOP.ParentGroup != null checks. (diff) | |
download | opensim-SC_OLD-63bf71023772ea9c54687c5006fcf6649eb1139f.zip opensim-SC_OLD-63bf71023772ea9c54687c5006fcf6649eb1139f.tar.gz opensim-SC_OLD-63bf71023772ea9c54687c5006fcf6649eb1139f.tar.bz2 opensim-SC_OLD-63bf71023772ea9c54687c5006fcf6649eb1139f.tar.xz |
Fix issue with llGetTorque() where it would only ever return a zero vector.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 4e7504a..982c492 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1536,15 +1536,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1536 | m_parentGroup.setAngularImpulse(impulse); | 1536 | m_parentGroup.setAngularImpulse(impulse); |
1537 | } | 1537 | } |
1538 | 1538 | ||
1539 | public Vector3 GetTorque() | ||
1540 | { | ||
1541 | if (m_parentGroup != null) | ||
1542 | { | ||
1543 | m_parentGroup.GetTorque(); | ||
1544 | } | ||
1545 | return Vector3.Zero; | ||
1546 | } | ||
1547 | |||
1548 | /// <summary> | 1539 | /// <summary> |
1549 | /// Apply physics to this part. | 1540 | /// Apply physics to this part. |
1550 | /// </summary> | 1541 | /// </summary> |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index dff7269..8d95546 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2202,7 +2202,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2202 | public LSL_Vector llGetTorque() | 2202 | public LSL_Vector llGetTorque() |
2203 | { | 2203 | { |
2204 | m_host.AddScriptLPS(1); | 2204 | m_host.AddScriptLPS(1); |
2205 | Vector3 torque = m_host.GetTorque(); | 2205 | Vector3 torque = m_host.ParentGroup.GetTorque(); |
2206 | return new LSL_Vector(torque.X,torque.Y,torque.Z); | 2206 | return new LSL_Vector(torque.X,torque.Y,torque.Z); |
2207 | } | 2207 | } |
2208 | 2208 | ||