diff options
author | Diva Canto | 2011-05-04 12:04:35 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-04 12:04:35 -0700 |
commit | 6c503e75acb459e4cdda423bbfbf4cb22611315e (patch) | |
tree | e01ebff20708bd4b27cf4aafabc86624339f08d9 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |
parent | Fixes mantis #5461. (diff) | |
download | opensim-SC_OLD-6c503e75acb459e4cdda423bbfbf4cb22611315e.zip opensim-SC_OLD-6c503e75acb459e4cdda423bbfbf4cb22611315e.tar.gz opensim-SC_OLD-6c503e75acb459e4cdda423bbfbf4cb22611315e.tar.bz2 opensim-SC_OLD-6c503e75acb459e4cdda423bbfbf4cb22611315e.tar.xz |
Put the previous state back in the attachments in case the agent transfer fails.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index b985fbb..e380067 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1759,11 +1759,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1759 | 1759 | ||
1760 | protected void ReInstantiateScripts(ScenePresence sp) | 1760 | protected void ReInstantiateScripts(ScenePresence sp) |
1761 | { | 1761 | { |
1762 | int i = 0; | ||
1762 | sp.Attachments.ForEach(delegate(SceneObjectGroup sog) | 1763 | sp.Attachments.ForEach(delegate(SceneObjectGroup sog) |
1763 | { | 1764 | { |
1765 | sog.SetState(sp.InTransitScriptStates[i++], sp.Scene); | ||
1764 | sog.CreateScriptInstances(0, false, sp.Scene.DefaultScriptEngine, 0); | 1766 | sog.CreateScriptInstances(0, false, sp.Scene.DefaultScriptEngine, 0); |
1765 | sog.ResumeScripts(); | 1767 | sog.ResumeScripts(); |
1766 | }); | 1768 | }); |
1769 | |||
1770 | sp.InTransitScriptStates.Clear(); | ||
1767 | } | 1771 | } |
1768 | #endregion | 1772 | #endregion |
1769 | 1773 | ||