diff options
| author | Melanie Thielker | 2008-09-03 18:57:06 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-09-03 18:57:06 +0000 |
| commit | ef27c8817fb2899b02116296001770005622f375 (patch) | |
| tree | 2a75a9cabf187e670b848ccdb88eb43c7e76f8d0 /OpenSim/Region/ScriptEngine/Shared/Api | |
| parent | add standard copyright headers for the project (diff) | |
| download | opensim-SC_OLD-ef27c8817fb2899b02116296001770005622f375.zip opensim-SC_OLD-ef27c8817fb2899b02116296001770005622f375.tar.gz opensim-SC_OLD-ef27c8817fb2899b02116296001770005622f375.tar.bz2 opensim-SC_OLD-ef27c8817fb2899b02116296001770005622f375.tar.xz | |
Mantis #2112
Thannk you, ralphos, for a patch to clean up list item type handling
and add a missing explicit cast in Shared/
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 14 |
1 files changed, 7 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 d4911d7..aa22b2b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -5721,13 +5721,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 5721 | if (remain < 7) | 5721 | if (remain < 7) |
| 5722 | return; | 5722 | return; |
| 5723 | 5723 | ||
| 5724 | LSL_Types.LSLInteger flexi = new LSL_Types.LSLInteger(rules.Data[idx++].ToString()); | 5724 | bool flexi = (LSL_Types.LSLInteger)rules.Data[idx++]; |
| 5725 | int softness = Convert.ToInt32(rules.Data[idx++]); | 5725 | int softness = (LSL_Types.LSLInteger)rules.Data[idx++]; |
| 5726 | float gravity = (float)Convert.ToDouble(rules.Data[idx++]); | 5726 | float gravity = (float)(LSL_Types.LSLFloat)rules.Data[idx++]; |
| 5727 | float friction = (float)Convert.ToDouble(rules.Data[idx++]); | 5727 | float friction = (float)(LSL_Types.LSLFloat)rules.Data[idx++]; |
| 5728 | float wind = (float)Convert.ToDouble(rules.Data[idx++]); | 5728 | float wind = (float)(LSL_Types.LSLFloat)rules.Data[idx++]; |
| 5729 | float tension = (float)Convert.ToDouble(rules.Data[idx++]); | 5729 | float tension = (float)(LSL_Types.LSLFloat)rules.Data[idx++]; |
| 5730 | LSL_Types.Vector3 force =new LSL_Types.Vector3(rules.Data[idx++].ToString()); | 5730 | LSL_Types.Vector3 force = (LSL_Types.Vector3)rules.Data[idx++]; |
| 5731 | 5731 | ||
| 5732 | SetFlexi(part, flexi, softness, gravity, friction, wind, tension, force); | 5732 | SetFlexi(part, flexi, softness, gravity, friction, wind, tension, force); |
| 5733 | 5733 | ||