diff options
| author | Melanie Thielker | 2015-08-19 01:00:42 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2015-08-19 01:00:42 +0200 |
| commit | 62f3399559a1214ee797d53be1bd1297d471a2b7 (patch) | |
| tree | f9f6f8ddd46376a4e3383297f17f2fe2ddbded50 /OpenSim/Region | |
| parent | Change the IScriptApi back to it's original form, removing XEngine (diff) | |
| download | opensim-SC-62f3399559a1214ee797d53be1bd1297d471a2b7.zip opensim-SC-62f3399559a1214ee797d53be1bd1297d471a2b7.tar.gz opensim-SC-62f3399559a1214ee797d53be1bd1297d471a2b7.tar.bz2 opensim-SC-62f3399559a1214ee797d53be1bd1297d471a2b7.tar.xz | |
Try to address Mantis #7689. When adding a scalar to a list, make a copy
as is done when adding another list.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index ca81af1..f14a8fb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
| @@ -712,8 +712,11 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
| 712 | 712 | ||
| 713 | private void ExtendAndAdd(object o) | 713 | private void ExtendAndAdd(object o) |
| 714 | { | 714 | { |
| 715 | Array.Resize(ref m_data, Length + 1); | 715 | object[] tmp; |
| 716 | m_data.SetValue(o, Length - 1); | 716 | tmp = new object[m_data.Length + 1]; |
| 717 | m_data.CopyTo(tmp, 0); | ||
| 718 | tmp.SetValue(o, tmp.Length - 1); | ||
| 719 | m_data = tmp; | ||
| 717 | } | 720 | } |
| 718 | 721 | ||
| 719 | public static list operator +(list a, LSLString s) | 722 | public static list operator +(list a, LSLString s) |