From fda56618e154c2fcbf76d57abfc66eb94156221e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 6 Jan 2011 16:17:43 -0800
Subject: Deal with possibly un-initialized scripts in object transfers. Mantis
 #5310

---
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 8e712b6..783791f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -864,7 +864,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public Dictionary<string, object> GetVars()
         {
-            return m_Script.GetVars();
+            if (m_Script != null)
+                return m_Script.GetVars();
+            else
+                return new Dictionary<string, object>();
         }
 
         public void SetVars(Dictionary<string, object> vars)
-- 
cgit v1.1