diff options
author | UbitUmarov | 2017-05-28 03:17:34 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-28 03:17:34 +0100 |
commit | 687c01b29e0af99b770a111478516fa6634e9594 (patch) | |
tree | dc851470ce8cbbb3fb7f78a3a96ef859713ca0b4 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | a null ref check left behind on previus commits (diff) | |
download | opensim-SC_OLD-687c01b29e0af99b770a111478516fa6634e9594.zip opensim-SC_OLD-687c01b29e0af99b770a111478516fa6634e9594.tar.gz opensim-SC_OLD-687c01b29e0af99b770a111478516fa6634e9594.tar.bz2 opensim-SC_OLD-687c01b29e0af99b770a111478516fa6634e9594.tar.xz |
need to delay even more agent close after teleport to compensate for slow machines and user connections. This one of current tp teleport protocol flaws
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index ca20604..6b8d597 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -417,12 +417,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
417 | } | 417 | } |
418 | catch (Exception e) | 418 | catch (Exception e) |
419 | { | 419 | { |
420 | |||
420 | m_log.ErrorFormat( | 421 | m_log.ErrorFormat( |
421 | "[ENTITY TRANSFER MODULE]: Exception on teleport of {0} from {1}@{2} to {3}@{4}: {5}{6}", | 422 | "[ENTITY TRANSFER MODULE]: Exception on teleport of {0} from {1}@{2} to {3}@{4}: {5}{6}", |
422 | sp.Name, sp.AbsolutePosition, sp.Scene.RegionInfo.RegionName, position, destinationRegionName, | 423 | sp.Name, sp.AbsolutePosition, sp.Scene.RegionInfo.RegionName, position, destinationRegionName, |
423 | e.Message, e.StackTrace); | 424 | e.Message, e.StackTrace); |
424 | 425 | if(sp != null && sp.ControllingClient != null && !sp.IsDeleted) | |
425 | sp.ControllingClient.SendTeleportFailed("Internal error"); | 426 | sp.ControllingClient.SendTeleportFailed("Internal error"); |
426 | } | 427 | } |
427 | finally | 428 | finally |
428 | { | 429 | { |
@@ -1216,7 +1217,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1216 | // DECREASING THE WAIT TIME HERE WILL EITHER RESULT IN A VIEWER CRASH OR | 1217 | // DECREASING THE WAIT TIME HERE WILL EITHER RESULT IN A VIEWER CRASH OR |
1217 | // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS. | 1218 | // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS. |
1218 | 1219 | ||
1219 | Thread.Sleep(15000); | 1220 | Thread.Sleep(25000); |
1220 | // if (m_eqModule != null && !sp.DoNotCloseAfterTeleport) | 1221 | // if (m_eqModule != null && !sp.DoNotCloseAfterTeleport) |
1221 | // m_eqModule.DisableSimulator(sourceRegionHandle,sp.UUID); | 1222 | // m_eqModule.DisableSimulator(sourceRegionHandle,sp.UUID); |
1222 | // Thread.Sleep(1000); | 1223 | // Thread.Sleep(1000); |