aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2017-04-24 02:05:39 +0100
committerUbitUmarov2017-04-24 02:05:39 +0100
commit65a154720955536fa2327ace99e3ae0d72a585ad (patch)
tree85b6cbe398690c00f75c80bcdcb0b9be8e8d1361 /OpenSim/Region
parent update ode binaries for windows (diff)
downloadopensim-SC-65a154720955536fa2327ace99e3ae0d72a585ad.zip
opensim-SC-65a154720955536fa2327ace99e3ae0d72a585ad.tar.gz
opensim-SC-65a154720955536fa2327ace99e3ae0d72a585ad.tar.bz2
opensim-SC-65a154720955536fa2327ace99e3ae0d72a585ad.tar.xz
fix (or actually break) llList2float() since LSL_Key is same as LSL_String, the case of invalid LSL_Key cannot be handle, since most likely it is a string
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 443ea72..31be2fb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5807,8 +5807,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5807 string s = item.ToString(); 5807 string s = item.ToString();
5808 if(UUID.TryParse(s, out uuidt)) 5808 if(UUID.TryParse(s, out uuidt))
5809 return Convert.ToDouble(new LSL_Integer(s).value); 5809 return Convert.ToDouble(new LSL_Integer(s).value);
5810 else 5810// we can't do this because a string is also a LSL_Key for now :(
5811 return 0; 5811// else
5812// return 0;
5812 } 5813 }
5813 5814
5814 try 5815 try