From 84ba5dd962c712d4092d78536526df9dabd1c582 Mon Sep 17 00:00:00 2001
From: idb
Date: Sat, 6 Dec 2008 14:55:18 +0000
Subject: Fix an ArgumentNullException when moving a DotNet scripted object to
 the next region

---
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 0b19e85..3c3eb19 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -967,7 +967,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         {
             IScriptInstance instance = GetInstance(itemID);
             if (instance == null)
-                return null;
+                return "";
             return instance.GetAssemblyName();
         }
 
@@ -975,7 +975,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         {
             IScriptInstance instance = GetInstance(itemID);
             if (instance == null)
-                return null;
+                return "";
             return instance.GetXMLState();
         }
     }
-- 
cgit v1.1