diff options
author | Melanie Thielker | 2008-09-08 18:15:36 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-08 18:15:36 +0000 |
commit | e7abde70a211d17ebfbae5e3ff379338a649f567 (patch) | |
tree | ac79095cce47bbfeebbfdd66856541af77bbb13c /OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |
parent | * some if inversions and added {}'s for readability (diff) | |
download | opensim-SC_OLD-e7abde70a211d17ebfbae5e3ff379338a649f567.zip opensim-SC_OLD-e7abde70a211d17ebfbae5e3ff379338a649f567.tar.gz opensim-SC_OLD-e7abde70a211d17ebfbae5e3ff379338a649f567.tar.bz2 opensim-SC_OLD-e7abde70a211d17ebfbae5e3ff379338a649f567.tar.xz |
Mantis #2147
Thank you, ralphos, for a patch the adapts llSetColor and friends to
a change in the underlying types.
Also, thank you for a much cleaner way of casting types out of
lists, which I will adopt throughout.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 3820dae..4554b0c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
@@ -472,7 +472,6 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
472 | return (LSL_Types.key)m_data[itemIndex]; | 472 | return (LSL_Types.key)m_data[itemIndex]; |
473 | } | 473 | } |
474 | 474 | ||
475 | |||
476 | public static list operator +(list a, list b) | 475 | public static list operator +(list a, list b) |
477 | { | 476 | { |
478 | object[] tmp; | 477 | object[] tmp; |
@@ -488,19 +487,19 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
488 | m_data.SetValue(o, Length - 1); | 487 | m_data.SetValue(o, Length - 1); |
489 | } | 488 | } |
490 | 489 | ||
491 | public static list operator +(list a, string s) | 490 | public static list operator +(list a, LSLString s) |
492 | { | 491 | { |
493 | a.ExtendAndAdd(s); | 492 | a.ExtendAndAdd(s); |
494 | return a; | 493 | return a; |
495 | } | 494 | } |
496 | 495 | ||
497 | public static list operator +(list a, int i) | 496 | public static list operator +(list a, LSLInteger i) |
498 | { | 497 | { |
499 | a.ExtendAndAdd(i); | 498 | a.ExtendAndAdd(i); |
500 | return a; | 499 | return a; |
501 | } | 500 | } |
502 | 501 | ||
503 | public static list operator +(list a, double d) | 502 | public static list operator +(list a, LSLFloat d) |
504 | { | 503 | { |
505 | a.ExtendAndAdd(d); | 504 | a.ExtendAndAdd(d); |
506 | return a; | 505 | return a; |