From 62f3399559a1214ee797d53be1bd1297d471a2b7 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 19 Aug 2015 01:00:42 +0200
Subject: Try to address Mantis #7689. When adding a scalar to a list, make a
 copy as is done when adding another list.

---
 OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

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
 
             private void ExtendAndAdd(object o)
             {
-                Array.Resize(ref m_data, Length + 1);
-                m_data.SetValue(o, Length - 1);
+                object[] tmp;
+                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)
-- 
cgit v1.1