diff options
| author | Melanie Thielker | 2015-08-23 17:48:48 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2015-08-23 17:48:48 +0200 |
| commit | a9beee705074ab03573082b185fc2d9a6ec589a0 (patch) | |
| tree | 3144eb3f861ba0e02043800dfe648315640a54d7 /OpenSim/Region/ScriptEngine | |
| parent | Fix the nullref in scripts - the right way (diff) | |
| download | opensim-SC-a9beee705074ab03573082b185fc2d9a6ec589a0.zip opensim-SC-a9beee705074ab03573082b185fc2d9a6ec589a0.tar.gz opensim-SC-a9beee705074ab03573082b185fc2d9a6ec589a0.tar.bz2 opensim-SC-a9beee705074ab03573082b185fc2d9a6ec589a0.tar.xz | |
Revert "Revert "Fix a possible nullref caused by accessing m_data rather than Data""
Needed after all
This reverts commit 26094c21feb8f63d7e6ed46ec2668f213d9dc623.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 8 |
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 eca7a74..d6f5102 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) |