diff options
author | Mike Mazur | 2008-07-25 04:47:11 +0000 |
---|---|---|
committer | Mike Mazur | 2008-07-25 04:47:11 +0000 |
commit | e60cf0e67d7f34c5d2a45d98c400b9cdea58752a (patch) | |
tree | 61340cdcf8346ed9e787d4739a8eda921fba84f8 /OpenSim/Region | |
parent | Add mingchen's fix for string->float cast to Shared/ (diff) | |
download | opensim-SC_OLD-e60cf0e67d7f34c5d2a45d98c400b9cdea58752a.zip opensim-SC_OLD-e60cf0e67d7f34c5d2a45d98c400b9cdea58752a.tar.gz opensim-SC_OLD-e60cf0e67d7f34c5d2a45d98c400b9cdea58752a.tar.bz2 opensim-SC_OLD-e60cf0e67d7f34c5d2a45d98c400b9cdea58752a.tar.xz |
-add test for newly introduced cast operators (issue 1818)
-fix formatting
-remove CompilerTest test since it seems to fail randomly
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index 9bde177..0b28af0 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | |||
@@ -1189,6 +1189,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1189 | { | 1189 | { |
1190 | return new Vector3(s.m_string); | 1190 | return new Vector3(s.m_string); |
1191 | } | 1191 | } |
1192 | |||
1192 | public static implicit operator LSLFloat(LSLString s) | 1193 | public static implicit operator LSLFloat(LSLString s) |
1193 | { | 1194 | { |
1194 | return new LSLFloat(Convert.ToDouble(s.m_string)); | 1195 | return new LSLFloat(Convert.ToDouble(s.m_string)); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 73ec9df..f49d453 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
@@ -1199,10 +1199,11 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
1199 | { | 1199 | { |
1200 | return new Vector3(s.m_string); | 1200 | return new Vector3(s.m_string); |
1201 | } | 1201 | } |
1202 | public static implicit operator LSLFloat(LSLString s) | 1202 | |
1203 | { | 1203 | public static implicit operator LSLFloat(LSLString s) |
1204 | return new LSLFloat(Convert.ToDouble(s.m_string)); | 1204 | { |
1205 | } | 1205 | return new LSLFloat(Convert.ToDouble(s.m_string)); |
1206 | } | ||
1206 | 1207 | ||
1207 | #endregion | 1208 | #endregion |
1208 | 1209 | ||