diff options
author | UbitUmarov | 2015-11-24 14:01:51 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-24 14:01:51 +0000 |
commit | f45905851ab0a49dd29fdff0491cefb75cca4b35 (patch) | |
tree | aa59ede3e0cd845329594c2bb85d048e6b43b201 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | reduce 'echos' on several regions per instance (mantis 7754) (diff) | |
download | opensim-SC_OLD-f45905851ab0a49dd29fdff0491cefb75cca4b35.zip opensim-SC_OLD-f45905851ab0a49dd29fdff0491cefb75cca4b35.tar.gz opensim-SC_OLD-f45905851ab0a49dd29fdff0491cefb75cca4b35.tar.bz2 opensim-SC_OLD-f45905851ab0a49dd29fdff0491cefb75cca4b35.tar.xz |
at end of teleport disable the sending simulator, not destiny
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index ed93f05..3fe8171 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1049,6 +1049,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1049 | 1049 | ||
1050 | sp.HasMovedAway(!(OutSideViewRange || logout)); | 1050 | sp.HasMovedAway(!(OutSideViewRange || logout)); |
1051 | 1051 | ||
1052 | ulong sourceRegionHandle = sp.RegionHandle; | ||
1053 | |||
1052 | // Now let's make it officially a child agent | 1054 | // Now let's make it officially a child agent |
1053 | sp.MakeChildAgent(destinationHandle); | 1055 | sp.MakeChildAgent(destinationHandle); |
1054 | 1056 | ||
@@ -1067,7 +1069,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1067 | // an agent cannot teleport back to this region if it has teleported away. | 1069 | // an agent cannot teleport back to this region if it has teleported away. |
1068 | Thread.Sleep(2000); | 1070 | Thread.Sleep(2000); |
1069 | if (m_eqModule != null && !sp.DoNotCloseAfterTeleport) | 1071 | if (m_eqModule != null && !sp.DoNotCloseAfterTeleport) |
1070 | m_eqModule.DisableSimulator(sp.RegionHandle,sp.UUID); | 1072 | m_eqModule.DisableSimulator(sourceRegionHandle,sp.UUID); |
1071 | Thread.Sleep(500); | 1073 | Thread.Sleep(500); |
1072 | sp.Scene.CloseAgent(sp.UUID, false); | 1074 | sp.Scene.CloseAgent(sp.UUID, false); |
1073 | } | 1075 | } |
@@ -1194,6 +1196,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1194 | //HG hook | 1196 | //HG hook |
1195 | AgentHasMovedAway(sp, logout); | 1197 | AgentHasMovedAway(sp, logout); |
1196 | 1198 | ||
1199 | ulong sourceRegionHandle = sp.RegionHandle; | ||
1200 | |||
1197 | // Now let's make it officially a child agent | 1201 | // Now let's make it officially a child agent |
1198 | sp.MakeChildAgent(destinationHandle); | 1202 | sp.MakeChildAgent(destinationHandle); |
1199 | 1203 | ||
@@ -1215,7 +1219,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1215 | 1219 | ||
1216 | Thread.Sleep(14000); | 1220 | Thread.Sleep(14000); |
1217 | if (m_eqModule != null && !sp.DoNotCloseAfterTeleport) | 1221 | if (m_eqModule != null && !sp.DoNotCloseAfterTeleport) |
1218 | m_eqModule.DisableSimulator(sp.RegionHandle,sp.UUID); | 1222 | m_eqModule.DisableSimulator(sourceRegionHandle,sp.UUID); |
1219 | Thread.Sleep(1000); | 1223 | Thread.Sleep(1000); |
1220 | 1224 | ||
1221 | // OK, it got this agent. Let's close everything | 1225 | // OK, it got this agent. Let's close everything |