1 files changed, 28 insertions, 3 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index c9c4753..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)
@@ -633,19 +633,44 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             public LSL_Types.Vector3 GetVector3Item(int itemIndex)
             {
-                if(m_data[itemIndex] is LSL_Types.Vector3)
+                if (m_data[itemIndex] is LSL_Types.Vector3)
+                {
                     return (LSL_Types.Vector3)m_data[itemIndex];
+                }
+                else if(m_data[itemIndex] is OpenMetaverse.Vector3)
+                {
+                    return new LSL_Types.Vector3(
+                            (OpenMetaverse.Vector3)m_data[itemIndex]);
+                }
                 else
+                {
                     throw new InvalidCastException(string.Format(
                         "{0} expected but {1} given",
                         typeof(LSL_Types.Vector3).Name,
                         m_data[itemIndex] != null ?
                         m_data[itemIndex].GetType().Name : "null"));
+                }
             }
 
             public LSL_Types.Quaternion GetQuaternionItem(int itemIndex)
             {
-              return (LSL_Types.Quaternion)m_data[itemIndex];
+                if (m_data[itemIndex] is LSL_Types.Quaternion)
+                {
+                    return (LSL_Types.Quaternion)m_data[itemIndex];
+                }
+                else if(m_data[itemIndex] is OpenMetaverse.Quaternion)
+                {
+                    return new LSL_Types.Quaternion(
+                            (OpenMetaverse.Quaternion)m_data[itemIndex]);
+                }
+                else
+                {
+                    throw new InvalidCastException(string.Format(
+                        "{0} expected but {1} given",
+                        typeof(LSL_Types.Quaternion).Name,
+                        m_data[itemIndex] != null ?
+                        m_data[itemIndex].GetType().Name : "null"));
+                }
             }
 
             public LSL_Types.key GetKeyItem(int itemIndex)