aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-22 15:55:23 +0200
committerMelanie Thielker2010-08-22 15:55:23 +0200
commit98b2d3a7f2f95ee26de76147d0d43468d8c5ad71 (patch)
tree3e39b554917f468e5004b06990d0041a0f5a6a98 /OpenSim
parentAdd printing the default script engine name. Report real exceptions when (diff)
downloadopensim-SC_OLD-98b2d3a7f2f95ee26de76147d0d43468d8c5ad71.zip
opensim-SC_OLD-98b2d3a7f2f95ee26de76147d0d43468d8c5ad71.tar.gz
opensim-SC_OLD-98b2d3a7f2f95ee26de76147d0d43468d8c5ad71.tar.bz2
opensim-SC_OLD-98b2d3a7f2f95ee26de76147d0d43468d8c5ad71.tar.xz
Revert "Fix a typecasting issue in llList2Float. This addresses mantis #262"
This reverts commit 810840b8624886a615f303baf74f7b72fb1ca66a. This breaks llList2Float in horrible ways. 12 hours 14 minutes becomes 1214.0 and 023.145 becomes 23145.0 Could just add the dot to fix the latter issue but that would not help the first part. Another solution is needed.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d856464..5caade6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5123,7 +5123,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5123 else if (src.Data[index] is LSL_Float) 5123 else if (src.Data[index] is LSL_Float)
5124 return Convert.ToDouble(((LSL_Float) src.Data[index]).value); 5124 return Convert.ToDouble(((LSL_Float) src.Data[index]).value);
5125 else if (src.Data[index] is LSL_String) 5125 else if (src.Data[index] is LSL_String)
5126 return Convert.ToDouble(Regex.Replace(((LSL_String)src.Data[index]).m_string, "[^0-9]", "")); 5126 return Convert.ToDouble(((LSL_String) src.Data[index]).m_string);
5127 return Convert.ToDouble(src.Data[index]); 5127 return Convert.ToDouble(src.Data[index]);
5128 } 5128 }
5129 catch (FormatException) 5129 catch (FormatException)