diff options
| author | Dahlia Trimble | 2008-07-25 02:06:40 +0000 |
|---|---|---|
| committer | Dahlia Trimble | 2008-07-25 02:06:40 +0000 |
| commit | c1e239dedce6ce91cdfcd8c20108144b01df724d (patch) | |
| tree | ff2e488b0e3380bc71678d0e4707e8412dd3b02c /OpenSim | |
| parent | Let's not fail if tests fail. (diff) | |
| download | opensim-SC_OLD-c1e239dedce6ce91cdfcd8c20108144b01df724d.zip opensim-SC_OLD-c1e239dedce6ce91cdfcd8c20108144b01df724d.tar.gz opensim-SC_OLD-c1e239dedce6ce91cdfcd8c20108144b01df724d.tar.bz2 opensim-SC_OLD-c1e239dedce6ce91cdfcd8c20108144b01df724d.tar.xz | |
llApplyImpulse now accepts any non-zero integer as not FALSE
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 16 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 10 |
2 files changed, 5 insertions, 21 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index d7fd2c5..2ef5c47 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
| @@ -1659,21 +1659,13 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
| 1659 | //No energy force yet | 1659 | //No energy force yet |
| 1660 | 1660 | ||
| 1661 | if (force.x > 20000) | 1661 | if (force.x > 20000) |
| 1662 | force.x = 20000; | 1662 | force.x = 20000; |
| 1663 | if (force.y > 20000) | 1663 | if (force.y > 20000) |
| 1664 | force.y = 20000; | 1664 | force.y = 20000; |
| 1665 | if (force.z > 20000) | 1665 | if (force.z > 20000) |
| 1666 | force.z = 20000; | 1666 | force.z = 20000; |
| 1667 | 1667 | ||
| 1668 | if (local == 1) | 1668 | m_host.ApplyImpulse(new LLVector3((float)force.x, (float)force.y, (float)force.z), local != 0); |
| 1669 | { | ||
| 1670 | m_host.ApplyImpulse(new LLVector3((float)force.x, (float)force.y, (float)force.z), true); | ||
| 1671 | } | ||
| 1672 | else | ||
| 1673 | { | ||
| 1674 | |||
| 1675 | m_host.ApplyImpulse(new LLVector3((float)force.x,(float)force.y,(float)force.z), false); | ||
| 1676 | } | ||
| 1677 | } | 1669 | } |
| 1678 | 1670 | ||
| 1679 | public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local) | 1671 | public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 201308d..c9c4026 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -1517,15 +1517,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1517 | if (force.z > 20000) | 1517 | if (force.z > 20000) |
| 1518 | force.z = 20000; | 1518 | force.z = 20000; |
| 1519 | 1519 | ||
| 1520 | if (local == 1) | 1520 | m_host.ApplyImpulse(new LLVector3((float)force.x, (float)force.y, (float)force.z), local != 0); |
| 1521 | { | ||
| 1522 | m_host.ApplyImpulse(new LLVector3((float)force.x, (float)force.y, (float)force.z), true); | ||
| 1523 | } | ||
| 1524 | else | ||
| 1525 | { | ||
| 1526 | |||
| 1527 | m_host.ApplyImpulse(new LLVector3((float)force.x,(float)force.y,(float)force.z), false); | ||
| 1528 | } | ||
| 1529 | } | 1521 | } |
| 1530 | 1522 | ||
| 1531 | public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local) | 1523 | public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local) |