aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-13 12:58:44 +0000
committerMelanie Thielker2008-09-13 12:58:44 +0000
commit7f3a98b76da6fdbba069511d08bf88b63a604e5a (patch)
tree9090faab06f9884964f921376945de4b14f8af20 /OpenSim/Region/ScriptEngine/Shared
parentCircular path prim meshes are now joined where the path ends meet if they mat... (diff)
downloadopensim-SC_OLD-7f3a98b76da6fdbba069511d08bf88b63a604e5a.zip
opensim-SC_OLD-7f3a98b76da6fdbba069511d08bf88b63a604e5a.tar.gz
opensim-SC_OLD-7f3a98b76da6fdbba069511d08bf88b63a604e5a.tar.bz2
opensim-SC_OLD-7f3a98b76da6fdbba069511d08bf88b63a604e5a.tar.xz
Fix string parameters to functions taking lists as arguments. LSL
functions return CLI strings, which, in the case of lists, don't get wrapped. Therefore, the list had to be able to deal with that CLI type here. The correct fix would be to change all LSL function returns to LSL types.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 9f69ebb..572debc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -448,6 +448,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
448 { 448 {
449 return (LSL_Types.key)m_data[itemIndex]; 449 return (LSL_Types.key)m_data[itemIndex];
450 } 450 }
451 else if (m_data[itemIndex] is String)
452 {
453 return new LSL_Types.LSLString((string)m_data[itemIndex]);
454 }
451 else 455 else
452 { 456 {
453 return (LSL_Types.LSLString)m_data[itemIndex]; 457 return (LSL_Types.LSLString)m_data[itemIndex];