diff options
| author | Justin Clark-Casey (justincc) | 2015-01-22 23:12:10 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2015-01-23 00:27:57 +0000 |
| commit | d0a2ea0857c1342a42db31bce282c62c88c57e55 (patch) | |
| tree | b727ce53574216d12cc6549e74982ce5de850654 /OpenSim/Region/ScriptEngine/Shared/Instance | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-d0a2ea0857c1342a42db31bce282c62c88c57e55.zip opensim-SC-d0a2ea0857c1342a42db31bce282c62c88c57e55.tar.gz opensim-SC-d0a2ea0857c1342a42db31bce282c62c88c57e55.tar.bz2 opensim-SC-d0a2ea0857c1342a42db31bce282c62c88c57e55.tar.xz | |
Fix regression where the stored state of every second script in an object rezzed from inventory (e.g. attachments) was no longer loaded.
Likely a regression since f132f642 (2014-08-28)
Relates to http://opensimulator.org/mantis/view.php?id=7278
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index e202a24..b4b4fa0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -1043,6 +1043,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 1043 | 1043 | ||
| 1044 | public void SetVars(Dictionary<string, object> vars) | 1044 | public void SetVars(Dictionary<string, object> vars) |
| 1045 | { | 1045 | { |
| 1046 | // foreach (KeyValuePair<string, object> kvp in vars) | ||
| 1047 | // m_log.DebugFormat("[SCRIPT INSTANCE]: Setting var {0}={1}", kvp.Key, kvp.Value); | ||
| 1048 | |||
| 1046 | m_Script.SetVars(vars); | 1049 | m_Script.SetVars(vars); |
| 1047 | } | 1050 | } |
| 1048 | 1051 | ||