aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2015-08-19 23:33:38 +0200
committerMelanie Thielker2015-08-19 23:33:38 +0200
commit20326e1947f56c6c39a9e701859c286ebee062e0 (patch)
tree6370b4a5d758de4820d16d77506f55881e6a303a /OpenSim
parentConvert the lsl list type into a struct. EXPERIMENTAL! This may affect (diff)
downloadopensim-SC_OLD-20326e1947f56c6c39a9e701859c286ebee062e0.zip
opensim-SC_OLD-20326e1947f56c6c39a9e701859c286ebee062e0.tar.gz
opensim-SC_OLD-20326e1947f56c6c39a9e701859c286ebee062e0.tar.bz2
opensim-SC_OLD-20326e1947f56c6c39a9e701859c286ebee062e0.tar.xz
Fix a possible nullref caused by accessing m_data rather than Data
Diffstat (limited to 'OpenSim')
-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 2b93d84..0ee39ea 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[m_data.Length + 1]; 767 tmp = new object[Data.Length + 1];
768 m_data.CopyTo(tmp, 0); 768 Data.CopyTo(tmp, 0);
769 tmp[m_data.Length] = o; 769 tmp[Data.Length] = o; // Since this is tmp.Length - 1
770 m_data = tmp; 770 Data = tmp;
771 } 771 }
772 772
773 public bool Contains(object o) 773 public bool Contains(object o)