diff options
author | idb | 2008-12-06 14:55:18 +0000 |
---|---|---|
committer | idb | 2008-12-06 14:55:18 +0000 |
commit | 84ba5dd962c712d4092d78536526df9dabd1c582 (patch) | |
tree | f9ff34c783c7e345d98888cf75fd2f87fb915ab6 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | Fix typo in OpenSim.ini.example (#2764) (diff) | |
download | opensim-SC_OLD-84ba5dd962c712d4092d78536526df9dabd1c582.zip opensim-SC_OLD-84ba5dd962c712d4092d78536526df9dabd1c582.tar.gz opensim-SC_OLD-84ba5dd962c712d4092d78536526df9dabd1c582.tar.bz2 opensim-SC_OLD-84ba5dd962c712d4092d78536526df9dabd1c582.tar.xz |
Fix an ArgumentNullException when moving a DotNet scripted object to the next region
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
967 | { | 967 | { |
968 | IScriptInstance instance = GetInstance(itemID); | 968 | IScriptInstance instance = GetInstance(itemID); |
969 | if (instance == null) | 969 | if (instance == null) |
970 | return null; | 970 | return ""; |
971 | return instance.GetAssemblyName(); | 971 | return instance.GetAssemblyName(); |
972 | } | 972 | } |
973 | 973 | ||
@@ -975,7 +975,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
975 | { | 975 | { |
976 | IScriptInstance instance = GetInstance(itemID); | 976 | IScriptInstance instance = GetInstance(itemID); |
977 | if (instance == null) | 977 | if (instance == null) |
978 | return null; | 978 | return ""; |
979 | return instance.GetXMLState(); | 979 | return instance.GetXMLState(); |
980 | } | 980 | } |
981 | } | 981 | } |