diff options
| author | Melanie | 2012-12-21 22:13:41 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-21 22:13:41 +0000 |
| commit | 569f39e1242044a46693926c31d86fff6b4b228c (patch) | |
| tree | 69fb5c2b0ce512336680b48bbf89bb42bb8f5b88 /OpenSim/Region/ScriptEngine/Shared/Api | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: small fix to avatar movement motor use which keeps avatar from fly... (diff) | |
| download | opensim-SC-569f39e1242044a46693926c31d86fff6b4b228c.zip opensim-SC-569f39e1242044a46693926c31d86fff6b4b228c.tar.gz opensim-SC-569f39e1242044a46693926c31d86fff6b4b228c.tar.bz2 opensim-SC-569f39e1242044a46693926c31d86fff6b4b228c.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 3a9d0ff..30bacc6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -1483,19 +1483,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1483 | return 0; | 1483 | return 0; |
| 1484 | 1484 | ||
| 1485 | case ScriptBaseClass.STATUS_ROTATE_X: | 1485 | case ScriptBaseClass.STATUS_ROTATE_X: |
| 1486 | if (m_host.GetAxisRotation(2) == 2) | 1486 | // if (m_host.GetAxisRotation(2) != 0) |
| 1487 | if (m_host.GetAxisRotation((int)SceneObjectGroup.axisSelect.STATUS_ROTATE_X) != 0) | ||
| 1487 | return 1; | 1488 | return 1; |
| 1488 | else | 1489 | else |
| 1489 | return 0; | 1490 | return 0; |
| 1490 | 1491 | ||
| 1491 | case ScriptBaseClass.STATUS_ROTATE_Y: | 1492 | case ScriptBaseClass.STATUS_ROTATE_Y: |
| 1492 | if (m_host.GetAxisRotation(4) == 4) | 1493 | if (m_host.GetAxisRotation((int)SceneObjectGroup.axisSelect.STATUS_ROTATE_Y) != 0) |
| 1493 | return 1; | 1494 | return 1; |
| 1494 | else | 1495 | else |
| 1495 | return 0; | 1496 | return 0; |
| 1496 | 1497 | ||
| 1497 | case ScriptBaseClass.STATUS_ROTATE_Z: | 1498 | case ScriptBaseClass.STATUS_ROTATE_Z: |
| 1498 | if (m_host.GetAxisRotation(8) == 8) | 1499 | if (m_host.GetAxisRotation((int)SceneObjectGroup.axisSelect.STATUS_ROTATE_Z) != 0) |
| 1499 | return 1; | 1500 | return 1; |
| 1500 | else | 1501 | else |
| 1501 | return 0; | 1502 | return 0; |