aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2015-08-19 01:04:10 +0200
committerMelanie Thielker2015-08-19 01:04:10 +0200
commitc61aee12d4cb1037d531c01f60ee5e9a5063af09 (patch)
tree9c370477283043834aaa9135c0151e29a9690df3 /OpenSim/Region
parentdo keepalive on mesh and texture GET. Dont use reusecontext any where. (diff)
downloadopensim-SC-c61aee12d4cb1037d531c01f60ee5e9a5063af09.zip
opensim-SC-c61aee12d4cb1037d531c01f60ee5e9a5063af09.tar.gz
opensim-SC-c61aee12d4cb1037d531c01f60ee5e9a5063af09.tar.bz2
opensim-SC-c61aee12d4cb1037d531c01f60ee5e9a5063af09.tar.xz
Fix adding a scalar to the end of a list
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs7
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)