diff options
| author | root | 2013-03-16 01:47:26 +0100 |
|---|---|---|
| committer | root | 2013-03-16 01:47:26 +0100 |
| commit | 1dcdea6ac45a17859c962739c080ccb9ab6c6105 (patch) | |
| tree | e4cf81a8900ed8f1a9e0700f3d70dda5d545bbf9 /OpenSim/Region | |
| parent | Limit each attachment point to 5 items as per spec (diff) | |
| download | opensim-SC-1dcdea6ac45a17859c962739c080ccb9ab6c6105.zip opensim-SC-1dcdea6ac45a17859c962739c080ccb9ab6c6105.tar.gz opensim-SC-1dcdea6ac45a17859c962739c080ccb9ab6c6105.tar.bz2 opensim-SC-1dcdea6ac45a17859c962739c080ccb9ab6c6105.tar.xz | |
Fix case where the string member of a LSL_String in a list is null
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index c9c4753..c6393ed 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
| @@ -512,7 +512,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
| 512 | else if (o is LSL_Types.LSLFloat) | 512 | else if (o is LSL_Types.LSLFloat) |
| 513 | size += 8; | 513 | size += 8; |
| 514 | else if (o is LSL_Types.LSLString) | 514 | else if (o is LSL_Types.LSLString) |
| 515 | size += ((LSL_Types.LSLString)o).m_string.Length; | 515 | size += ((LSL_Types.LSLString)o).m_string == null ? 0 : ((LSL_Types.LSLString)o).m_string.Length; |
| 516 | else if (o is LSL_Types.key) | 516 | else if (o is LSL_Types.key) |
| 517 | size += ((LSL_Types.key)o).value.Length; | 517 | size += ((LSL_Types.key)o).value.Length; |
| 518 | else if (o is LSL_Types.Vector3) | 518 | else if (o is LSL_Types.Vector3) |