Merge branch 'avination' into careminster

author: Melanie 2013-03-19 01:24:14 +0000
committer: Melanie 2013-03-19 01:24:14 +0000
commit: 8d9bfda72729b2967d9c12c23458c535600c6103 (patch)
tree: 17a3d31a105b86b82fc800204d7b20b5fa872c01 /OpenSim/Region/ScriptEngine/Shared
parent: Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parent: * Ignores VolumeDetect enabled prim in the camera raycast call. Note: The ... (diff)
download: opensim-SC_OLD-8d9bfda72729b2967d9c12c23458c535600c6103.zip
opensim-SC_OLD-8d9bfda72729b2967d9c12c23458c535600c6103.tar.gz
opensim-SC_OLD-8d9bfda72729b2967d9c12c23458c535600c6103.tar.bz2
opensim-SC_OLD-8d9bfda72729b2967d9c12c23458c535600c6103.tar.xz
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 2e61fb8..b524a18 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
                        else if (o is LSL_Types.LSLFloat)
                            size += 8;
                        else if (o is LSL_Types.LSLString)
-                            size += ((LSL_Types.LSLString)o).m_string.Length;
+                            size += ((LSL_Types.LSLString)o).m_string == null ? 0 : ((LSL_Types.LSLString)o).m_string.Length;
                        else if (o is LSL_Types.key)
                            size += ((LSL_Types.key)o).value.Length;
                        else if (o is LSL_Types.Vector3)
author	Melanie	2013-03-19 01:24:14 +0000
committer	Melanie	2013-03-19 01:24:14 +0000
commit	8d9bfda72729b2967d9c12c23458c535600c6103 (patch)
tree	17a3d31a105b86b82fc800204d7b20b5fa872c01 /OpenSim/Region/ScriptEngine/Shared
parent	Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parent	* Ignores VolumeDetect enabled prim in the camera raycast call. Note: The ... (diff)
download	opensim-SC_OLD-8d9bfda72729b2967d9c12c23458c535600c6103.zip opensim-SC_OLD-8d9bfda72729b2967d9c12c23458c535600c6103.tar.gz opensim-SC_OLD-8d9bfda72729b2967d9c12c23458c535600c6103.tar.bz2 opensim-SC_OLD-8d9bfda72729b2967d9c12c23458c535600c6103.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 2e61fb8..b524a18 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)