Merge branch 'master' into ubitworkmaster

avinationmerge
UbitUmarov 2015-08-19 02:47:14 +01:00
commit f17b5c5985
1 changed files with 5 additions and 2 deletions

View File

@ -714,8 +714,11 @@ namespace OpenSim.Region.ScriptEngine.Shared
private void ExtendAndAdd(object o) private void ExtendAndAdd(object o)
{ {
Array.Resize(ref m_data, Length + 1); object[] tmp;
m_data.SetValue(o, Length - 1); tmp = new object[m_data.Length + 1];
m_data.CopyTo(tmp, 0);
tmp.SetValue(o, tmp.Length - 1);
m_data = tmp;
} }
public static list operator +(list a, LSLString s) public static list operator +(list a, LSLString s)