diff options
| author | Mike Mazur | 2008-07-25 07:50:31 +0000 |
|---|---|---|
| committer | Mike Mazur | 2008-07-25 07:50:31 +0000 |
| commit | 19ad7db5e1ebcce8fc13995270b2ebe94f8a9a52 (patch) | |
| tree | 3de434cccd390c7068726e874756e44a9e82c322 /OpenSim/Region | |
| parent | Thanks, lulurun, for a patch that adds an authenticated session cache to reduce (diff) | |
| download | opensim-SC_OLD-19ad7db5e1ebcce8fc13995270b2ebe94f8a9a52.zip opensim-SC_OLD-19ad7db5e1ebcce8fc13995270b2ebe94f8a9a52.tar.gz opensim-SC_OLD-19ad7db5e1ebcce8fc13995270b2ebe94f8a9a52.tar.bz2 opensim-SC_OLD-19ad7db5e1ebcce8fc13995270b2ebe94f8a9a52.tar.xz | |
Add casts from integer to float. Fix issue 1822.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 5 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index 0b28af0..7ac7a65 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | |||
| @@ -1454,6 +1454,11 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
| 1454 | return new LSLFloat(i); | 1454 | return new LSLFloat(i); |
| 1455 | } | 1455 | } |
| 1456 | 1456 | ||
| 1457 | static public implicit operator LSLFloat(LSLInteger i) | ||
| 1458 | { | ||
| 1459 | return new LSLFloat(i.value); | ||
| 1460 | } | ||
| 1461 | |||
| 1457 | static public implicit operator LSLFloat(string s) | 1462 | static public implicit operator LSLFloat(string s) |
| 1458 | { | 1463 | { |
| 1459 | return new LSLFloat(double.Parse(s)); | 1464 | return new LSLFloat(double.Parse(s)); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index f49d453..7eb5e77 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
| @@ -1509,6 +1509,11 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
| 1509 | return new LSLFloat(i); | 1509 | return new LSLFloat(i); |
| 1510 | } | 1510 | } |
| 1511 | 1511 | ||
| 1512 | static public implicit operator LSLFloat(LSLInteger i) | ||
| 1513 | { | ||
| 1514 | return new LSLFloat(i.value); | ||
| 1515 | } | ||
| 1516 | |||
| 1512 | static public implicit operator LSLFloat(string s) | 1517 | static public implicit operator LSLFloat(string s) |
| 1513 | { | 1518 | { |
| 1514 | return new LSLFloat(double.Parse(s)); | 1519 | return new LSLFloat(double.Parse(s)); |