diff options
author | Robert Adams | 2012-12-18 14:59:41 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-18 19:25:40 -0800 |
commit | d15bfcf61404914c3d64c965db9e66295655bea5 (patch) | |
tree | be0ffafac781c1952cc1bf7cbaf35179ffce988a /OpenSim/Region/ScriptEngine | |
parent | Disable UDPPacketBuffer pooling for now to resolve an issue on Windows of int... (diff) | |
download | opensim-SC_OLD-d15bfcf61404914c3d64c965db9e66295655bea5.zip opensim-SC_OLD-d15bfcf61404914c3d64c965db9e66295655bea5.tar.gz opensim-SC_OLD-d15bfcf61404914c3d64c965db9e66295655bea5.tar.bz2 opensim-SC_OLD-d15bfcf61404914c3d64c965db9e66295655bea5.tar.xz |
Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-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 4108588..837779d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -1334,19 +1334,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1334 | return 0; | 1334 | return 0; |
1335 | 1335 | ||
1336 | case ScriptBaseClass.STATUS_ROTATE_X: | 1336 | case ScriptBaseClass.STATUS_ROTATE_X: |
1337 | if (m_host.GetAxisRotation(2) == 2) | 1337 | // if (m_host.GetAxisRotation(2) != 0) |
1338 | if (m_host.GetAxisRotation((int)SceneObjectGroup.axisSelect.STATUS_ROTATE_X) != 0) | ||
1338 | return 1; | 1339 | return 1; |
1339 | else | 1340 | else |
1340 | return 0; | 1341 | return 0; |
1341 | 1342 | ||
1342 | case ScriptBaseClass.STATUS_ROTATE_Y: | 1343 | case ScriptBaseClass.STATUS_ROTATE_Y: |
1343 | if (m_host.GetAxisRotation(4) == 4) | 1344 | if (m_host.GetAxisRotation((int)SceneObjectGroup.axisSelect.STATUS_ROTATE_Y) != 0) |
1344 | return 1; | 1345 | return 1; |
1345 | else | 1346 | else |
1346 | return 0; | 1347 | return 0; |
1347 | 1348 | ||
1348 | case ScriptBaseClass.STATUS_ROTATE_Z: | 1349 | case ScriptBaseClass.STATUS_ROTATE_Z: |
1349 | if (m_host.GetAxisRotation(8) == 8) | 1350 | if (m_host.GetAxisRotation((int)SceneObjectGroup.axisSelect.STATUS_ROTATE_Z) != 0) |
1350 | return 1; | 1351 | return 1; |
1351 | else | 1352 | else |
1352 | return 0; | 1353 | return 0; |