aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2015-08-23 17:34:20 +0200
committerMelanie Thielker2015-08-23 17:34:20 +0200
commit26094c21feb8f63d7e6ed46ec2668f213d9dc623 (patch)
tree50ede2fb9523e837f6d4f4886132001ee0e60cf2
parentRefine comments .ini file setup for new Standalone (diff)
downloadopensim-SC_OLD-26094c21feb8f63d7e6ed46ec2668f213d9dc623.zip
opensim-SC_OLD-26094c21feb8f63d7e6ed46ec2668f213d9dc623.tar.gz
opensim-SC_OLD-26094c21feb8f63d7e6ed46ec2668f213d9dc623.tar.bz2
opensim-SC_OLD-26094c21feb8f63d7e6ed46ec2668f213d9dc623.tar.xz
Revert "Fix a possible nullref caused by accessing m_data rather than Data"
My bad! This reverts commit 20326e1947f56c6c39a9e701859c286ebee062e0.
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 0ee39ea..2b93d84 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -764,10 +764,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
764 public void Add(object o) 764 public void Add(object o)
765 { 765 {
766 object[] tmp; 766 object[] tmp;
767 tmp = new object[Data.Length + 1]; 767 tmp = new object[m_data.Length + 1];
768 Data.CopyTo(tmp, 0); 768 m_data.CopyTo(tmp, 0);
769 tmp[Data.Length] = o; // Since this is tmp.Length - 1 769 tmp[m_data.Length] = o;
770 Data = tmp; 770 m_data = tmp;
771 } 771 }
772 772
773 public bool Contains(object o) 773 public bool Contains(object o)