diff options
| author | UbitUmarov | 2015-10-02 02:42:25 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-10-02 02:42:25 +0100 |
| commit | 31873485d9076c346df844a43dac4e38f713a040 (patch) | |
| tree | 4b3ecce057fc105e6cf38af0937e3d1a774a566b /OpenSim | |
| parent | send DisableSimulator messages on closing childagents. Possible still not on... (diff) | |
| download | opensim-SC_OLD-31873485d9076c346df844a43dac4e38f713a040.zip opensim-SC_OLD-31873485d9076c346df844a43dac4e38f713a040.tar.gz opensim-SC_OLD-31873485d9076c346df844a43dac4e38f713a040.tar.bz2 opensim-SC_OLD-31873485d9076c346df844a43dac4e38f713a040.tar.xz | |
do not send DisableSimulator on teleport if agent is already returning
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 4126b3b..a43b823 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1112,7 +1112,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1112 | // This sleep can be increased if necessary. However, whilst it's active, | 1112 | // This sleep can be increased if necessary. However, whilst it's active, |
| 1113 | // an agent cannot teleport back to this region if it has teleported away. | 1113 | // an agent cannot teleport back to this region if it has teleported away. |
| 1114 | Thread.Sleep(2000); | 1114 | Thread.Sleep(2000); |
| 1115 | if (m_eqModule != null) | 1115 | if (m_eqModule != null && !sp.DoNotCloseAfterTeleport) |
| 1116 | m_eqModule.DisableSimulator(sp.RegionHandle,sp.UUID); | 1116 | m_eqModule.DisableSimulator(sp.RegionHandle,sp.UUID); |
| 1117 | Thread.Sleep(500); | 1117 | Thread.Sleep(500); |
| 1118 | sp.Scene.CloseAgent(sp.UUID, false); | 1118 | sp.Scene.CloseAgent(sp.UUID, false); |
| @@ -1260,7 +1260,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1260 | // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS. | 1260 | // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS. |
| 1261 | 1261 | ||
| 1262 | Thread.Sleep(14000); | 1262 | Thread.Sleep(14000); |
| 1263 | if (m_eqModule != null) | 1263 | if (m_eqModule != null && !sp.DoNotCloseAfterTeleport) |
| 1264 | m_eqModule.DisableSimulator(sp.RegionHandle,sp.UUID); | 1264 | m_eqModule.DisableSimulator(sp.RegionHandle,sp.UUID); |
| 1265 | Thread.Sleep(1000); | 1265 | Thread.Sleep(1000); |
| 1266 | 1266 | ||