aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2011-01-06 16:17:43 -0800
committerDiva Canto2011-01-06 16:17:43 -0800
commitfda56618e154c2fcbf76d57abfc66eb94156221e (patch)
treee6572273a4e6d4344111ccdc4f66c62585171a33 /OpenSim
parentMap search: changed the flag sent to the client. It was 2 (???), now it's 0. ... (diff)
downloadopensim-SC_OLD-fda56618e154c2fcbf76d57abfc66eb94156221e.zip
opensim-SC_OLD-fda56618e154c2fcbf76d57abfc66eb94156221e.tar.gz
opensim-SC_OLD-fda56618e154c2fcbf76d57abfc66eb94156221e.tar.bz2
opensim-SC_OLD-fda56618e154c2fcbf76d57abfc66eb94156221e.tar.xz
Deal with possibly un-initialized scripts in object transfers. Mantis #5310
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs5
1 files changed, 4 insertions, 1 deletions
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
864 864
865 public Dictionary<string, object> GetVars() 865 public Dictionary<string, object> GetVars()
866 { 866 {
867 return m_Script.GetVars(); 867 if (m_Script != null)
868 return m_Script.GetVars();
869 else
870 return new Dictionary<string, object>();
868 } 871 }
869 872
870 public void SetVars(Dictionary<string, object> vars) 873 public void SetVars(Dictionary<string, object> vars)