aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMic Bowman2012-09-05 09:13:16 -0700
committerMic Bowman2012-09-05 09:13:16 -0700
commit641b08aa781fcf4c1bf6d8425c98a302f96a8b88 (patch)
tree67c46cea7e8ae1acfdcc0037badb59b7ba948106 /OpenSim/Region
parentBump master code up to 0.7.5 now that 0.7.4 is out. (diff)
downloadopensim-SC-641b08aa781fcf4c1bf6d8425c98a302f96a8b88.zip
opensim-SC-641b08aa781fcf4c1bf6d8425c98a302f96a8b88.tar.gz
opensim-SC-641b08aa781fcf4c1bf6d8425c98a302f96a8b88.tar.bz2
opensim-SC-641b08aa781fcf4c1bf6d8425c98a302f96a8b88.tar.xz
Enables cast from int to float for MOD* functions;
Thanks SignpostMarv!
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index 84cf6ca..cde2d9f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -310,7 +310,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
310 // ---------- Integer ---------- 310 // ---------- Integer ----------
311 else if (lslparm is LSL_Integer) 311 else if (lslparm is LSL_Integer)
312 { 312 {
313 if (type == typeof(int)) 313 if (type == typeof(int) || type == typeof(float))
314 return (int)(LSL_Integer)lslparm; 314 return (int)(LSL_Integer)lslparm;
315 } 315 }
316 316