aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-03 13:22:18 +0000
committerMelanie Thielker2008-09-03 13:22:18 +0000
commitb0965a41d6d551404e636e06b9c239dce500a515 (patch)
treead11073391f91da14b3533e1589c16d32eefb2b7
parentclean up and fixing a typo. (diff)
downloadopensim-SC_OLD-b0965a41d6d551404e636e06b9c239dce500a515.zip
opensim-SC_OLD-b0965a41d6d551404e636e06b9c239dce500a515.tar.gz
opensim-SC_OLD-b0965a41d6d551404e636e06b9c239dce500a515.tar.bz2
opensim-SC_OLD-b0965a41d6d551404e636e06b9c239dce500a515.tar.xz
Mantis #2097
Thank you, ralphos, for a patch that fixes an InvalidCastException in llSetPrimitveParams.
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
1 files changed, 3 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 e485669..d4911d7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5721,15 +5721,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5721 if (remain < 7) 5721 if (remain < 7)
5722 return; 5722 return;
5723 5723
5724 int flexi = Convert.ToInt32(rules.Data[idx++].ToString()); 5724 LSL_Types.LSLInteger flexi = new LSL_Types.LSLInteger(rules.Data[idx++].ToString());
5725 int softness = Convert.ToInt32(rules.Data[idx++].ToString()); 5725 int softness = Convert.ToInt32(rules.Data[idx++]);
5726 float gravity = (float)Convert.ToDouble(rules.Data[idx++]); 5726 float gravity = (float)Convert.ToDouble(rules.Data[idx++]);
5727 float friction = (float)Convert.ToDouble(rules.Data[idx++]); 5727 float friction = (float)Convert.ToDouble(rules.Data[idx++]);
5728 float wind = (float)Convert.ToDouble(rules.Data[idx++]); 5728 float wind = (float)Convert.ToDouble(rules.Data[idx++]);
5729 float tension = (float)Convert.ToDouble(rules.Data[idx++]); 5729 float tension = (float)Convert.ToDouble(rules.Data[idx++]);
5730 LSL_Types.Vector3 force =new LSL_Types.Vector3(rules.Data[idx++].ToString()); 5730 LSL_Types.Vector3 force =new LSL_Types.Vector3(rules.Data[idx++].ToString());
5731 5731
5732 SetFlexi(part, (flexi==1), softness, gravity, friction, wind, tension, force); 5732 SetFlexi(part, flexi, softness, gravity, friction, wind, tension, force);
5733 5733
5734 break; 5734 break;
5735 case (int)ScriptBaseClass.PRIM_POINT_LIGHT: 5735 case (int)ScriptBaseClass.PRIM_POINT_LIGHT: