diff options
| author | UbitUmarov | 2015-08-19 02:47:14 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-08-19 02:47:14 +0100 |
| commit | f17b5c598561e43d4850459311304bf7f70f06e2 (patch) | |
| tree | bda0337dd21c37a6112724e58ca8db27719048c3 /OpenSim/Region/ScriptEngine | |
| parent | add a Retry-After response header to the 503 sent when we are 2 busy to do (diff) | |
| parent | Merge branch 'ubitworkmaster' (diff) | |
| download | opensim-SC-f17b5c598561e43d4850459311304bf7f70f06e2.zip opensim-SC-f17b5c598561e43d4850459311304bf7f70f06e2.tar.gz opensim-SC-f17b5c598561e43d4850459311304bf7f70f06e2.tar.bz2 opensim-SC-f17b5c598561e43d4850459311304bf7f70f06e2.tar.xz | |
Merge branch 'master' into ubitworkmaster
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -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 4ba0e64..265bd2f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
| @@ -714,8 +714,11 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
| 714 | 714 | ||
| 715 | private void ExtendAndAdd(object o) | 715 | private void ExtendAndAdd(object o) |
| 716 | { | 716 | { |
| 717 | Array.Resize(ref m_data, Length + 1); | 717 | object[] tmp; |
| 718 | m_data.SetValue(o, Length - 1); | 718 | tmp = new object[m_data.Length + 1]; |
| 719 | m_data.CopyTo(tmp, 0); | ||
| 720 | tmp.SetValue(o, tmp.Length - 1); | ||
| 721 | m_data = tmp; | ||
| 719 | } | 722 | } |
| 720 | 723 | ||
| 721 | public static list operator +(list a, LSLString s) | 724 | public static list operator +(list a, LSLString s) |