diff options
| author | Melanie Thielker | 2015-08-23 17:36:08 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2015-08-23 17:36:08 +0200 |
| commit | c4ea4ea000dc1c40071c719b1564503eb57141a2 (patch) | |
| tree | 5dc46bc73c0b1be34c630e62ab9a0d219858d4d2 /OpenSim | |
| parent | Revert "Fix a possible nullref caused by accessing m_data rather than Data" (diff) | |
| download | opensim-SC-c4ea4ea000dc1c40071c719b1564503eb57141a2.zip opensim-SC-c4ea4ea000dc1c40071c719b1564503eb57141a2.tar.gz opensim-SC-c4ea4ea000dc1c40071c719b1564503eb57141a2.tar.bz2 opensim-SC-c4ea4ea000dc1c40071c719b1564503eb57141a2.tar.xz | |
Fix the nullref in scripts - the right way
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 2b93d84..eca7a74 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
| @@ -713,10 +713,10 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
| 713 | private void ExtendAndAdd(object o) | 713 | private void ExtendAndAdd(object o) |
| 714 | { | 714 | { |
| 715 | object[] tmp; | 715 | object[] tmp; |
| 716 | tmp = new object[m_data.Length + 1]; | 716 | tmp = new object[Data.Length + 1]; |
| 717 | m_data.CopyTo(tmp, 0); | 717 | Data.CopyTo(tmp, 0); |
| 718 | tmp.SetValue(o, tmp.Length - 1); | 718 | tmp.SetValue(o, tmp.Length - 1); |
| 719 | m_data = tmp; | 719 | Data = tmp; |
| 720 | } | 720 | } |
| 721 | 721 | ||
| 722 | public static list operator +(list a, LSLString s) | 722 | public static list operator +(list a, LSLString s) |