diff options
| author | Diva Canto | 2011-01-06 16:17:43 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-01-06 16:17:43 -0800 |
| commit | fda56618e154c2fcbf76d57abfc66eb94156221e (patch) | |
| tree | e6572273a4e6d4344111ccdc4f66c62585171a33 /OpenSim/Region | |
| parent | Map search: changed the flag sent to the client. It was 2 (???), now it's 0. ... (diff) | |
| download | opensim-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/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 5 |
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) |