diff options
| author | Melanie | 2011-01-11 14:41:37 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-11 14:41:37 +0000 |
| commit | 05b1b94cd8d8c7dfd3548dc92dff621a8220d5a4 (patch) | |
| tree | d150d46d3a78a72b230493dc1fbb26b4a218db93 /OpenSim | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff) | |
| parent | Use ToString() rather than a cast (more robust) (diff) | |
| download | opensim-SC-05b1b94cd8d8c7dfd3548dc92dff621a8220d5a4.zip opensim-SC-05b1b94cd8d8c7dfd3548dc92dff621a8220d5a4.tar.gz opensim-SC-05b1b94cd8d8c7dfd3548dc92dff621a8220d5a4.tar.bz2 opensim-SC-05b1b94cd8d8c7dfd3548dc92dff621a8220d5a4.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 5fd5bcf..f810fd8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
| @@ -560,7 +560,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
| 560 | else if (m_data[itemIndex] is Int32) | 560 | else if (m_data[itemIndex] is Int32) |
| 561 | return new LSLInteger((int)m_data[itemIndex]); | 561 | return new LSLInteger((int)m_data[itemIndex]); |
| 562 | else if (m_data[itemIndex] is LSL_Types.LSLString) | 562 | else if (m_data[itemIndex] is LSL_Types.LSLString) |
| 563 | return new LSLInteger((string)m_data[itemIndex]); | 563 | return new LSLInteger(m_data[itemIndex].ToString()); |
| 564 | else | 564 | else |
| 565 | throw new InvalidCastException(); | 565 | throw new InvalidCastException(); |
| 566 | } | 566 | } |