diff options
author | Justin Clark-Casey (justincc) | 2013-06-15 00:11:36 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-06-15 00:11:36 +0100 |
commit | da3724a904d1edb48b83d7f87b7283fd61c7a273 (patch) | |
tree | 2d24191d9ea103e0b80cd92e8accff99c9f609b3 /OpenSim | |
parent | Mantis 6280: llSetContentType(). An implementation. (diff) | |
download | opensim-SC_OLD-da3724a904d1edb48b83d7f87b7283fd61c7a273.zip opensim-SC_OLD-da3724a904d1edb48b83d7f87b7283fd61c7a273.tar.gz opensim-SC_OLD-da3724a904d1edb48b83d7f87b7283fd61c7a273.tar.bz2 opensim-SC_OLD-da3724a904d1edb48b83d7f87b7283fd61c7a273.tar.xz |
minor: remove mono compiler warnings from LSL_Api, properly format method doc for llRot2Axis()
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 733e868..256167c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4726,13 +4726,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4726 | return new LSL_Rotation(x,y,z,s); | 4726 | return new LSL_Rotation(x,y,z,s); |
4727 | } | 4727 | } |
4728 | 4728 | ||
4729 | 4729 | /// <summary> | |
4730 | // Xantor 29/apr/2008 | 4730 | /// Converts a Quaternion to X,Y,Z axis rotations |
4731 | // converts a Quaternion to X,Y,Z axis rotations | 4731 | /// </summary> |
4732 | /// <returns></returns> | ||
4733 | /// <param name='rot'></param> | ||
4732 | public LSL_Vector llRot2Axis(LSL_Rotation rot) | 4734 | public LSL_Vector llRot2Axis(LSL_Rotation rot) |
4733 | { | 4735 | { |
4734 | m_host.AddScriptLPS(1); | 4736 | m_host.AddScriptLPS(1); |
4735 | double x, y, z; | ||
4736 | 4737 | ||
4737 | if (Math.Abs(rot.s) > 1) // normalization needed | 4738 | if (Math.Abs(rot.s) > 1) // normalization needed |
4738 | rot.Normalize(); | 4739 | rot.Normalize(); |
@@ -7454,14 +7455,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7454 | return; | 7455 | return; |
7455 | } | 7456 | } |
7456 | 7457 | ||
7457 | int code = (int)options.GetLSLIntegerItem(0); | ||
7458 | |||
7459 | int idx = 0; | 7458 | int idx = 0; |
7460 | 7459 | ||
7461 | while (idx < options.Data.Length) | 7460 | while (idx < options.Data.Length) |
7462 | { | 7461 | { |
7463 | int option = (int)options.GetLSLIntegerItem(idx++); | 7462 | int option = (int)options.GetLSLIntegerItem(idx++); |
7464 | int remain = options.Data.Length - idx; | ||
7465 | 7463 | ||
7466 | switch (option) | 7464 | switch (option) |
7467 | { | 7465 | { |