aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-09-06 00:16:40 +0100
committerJustin Clark-Casey (justincc)2012-09-06 00:16:40 +0100
commitfbfd28a61b07f26c04d78c787532f9e930ff1ba8 (patch)
tree58df3eb4e0564ca8a1e87b0fbda46cfbb89463be
parentIf the GetTexture capability receives a request for a range of data beyond th... (diff)
parentEnables cast from int to float for MOD* functions; (diff)
downloadopensim-SC_OLD-fbfd28a61b07f26c04d78c787532f9e930ff1ba8.zip
opensim-SC_OLD-fbfd28a61b07f26c04d78c787532f9e930ff1ba8.tar.gz
opensim-SC_OLD-fbfd28a61b07f26c04d78c787532f9e930ff1ba8.tar.bz2
opensim-SC_OLD-fbfd28a61b07f26c04d78c787532f9e930ff1ba8.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-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