Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

This commit is contained in:
Justin Clark-Casey (justincc)
2012-09-06 00:16:40 +01:00

View File

@@ -310,7 +310,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// ---------- Integer ----------
else if (lslparm is LSL_Integer)
{
if (type == typeof(int))
if (type == typeof(int) || type == typeof(float))
return (int)(LSL_Integer)lslparm;
}