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

0.9.0-post-fixes
UbitUmarov 2017-05-28 03:17:34 +01:00
parent d1306c8976
commit 687c01b29e
1 changed files with 4 additions and 3 deletions

View File

@ -417,11 +417,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
}
catch (Exception e)
{
m_log.ErrorFormat(
"[ENTITY TRANSFER MODULE]: Exception on teleport of {0} from {1}@{2} to {3}@{4}: {5}{6}",
sp.Name, sp.AbsolutePosition, sp.Scene.RegionInfo.RegionName, position, destinationRegionName,
e.Message, e.StackTrace);
if(sp != null && sp.ControllingClient != null && !sp.IsDeleted)
sp.ControllingClient.SendTeleportFailed("Internal error");
}
finally
@ -1216,7 +1217,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// DECREASING THE WAIT TIME HERE WILL EITHER RESULT IN A VIEWER CRASH OR
// IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS.
Thread.Sleep(15000);
Thread.Sleep(25000);
// if (m_eqModule != null && !sp.DoNotCloseAfterTeleport)
// m_eqModule.DisableSimulator(sourceRegionHandle,sp.UUID);
// Thread.Sleep(1000);