aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2014-08-15 17:44:24 +0100
committerUbitUmarov2014-08-15 17:44:24 +0100
commit1314a02a95c062e45f3526252a8bc8c1d022ba7d (patch)
tree0c531c52d4d70ab34b19e18feb41cdfa59aed9a4
parent remove ban check from create caps. That needs to be done on caller (diff)
downloadopensim-SC-1314a02a95c062e45f3526252a8bc8c1d022ba7d.zip
opensim-SC-1314a02a95c062e45f3526252a8bc8c1d022ba7d.tar.gz
opensim-SC-1314a02a95c062e45f3526252a8bc8c1d022ba7d.tar.bz2
opensim-SC-1314a02a95c062e45f3526252a8bc8c1d022ba7d.tar.xz
adjust createAgent delay on childs creation. Beeing bad, it should be high
enougth to reasonable account for grid and region lag spikes
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 4d6b471..2bbb0a0 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -2097,15 +2097,21 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
2097 2097
2098 string reason = String.Empty; 2098 string reason = String.Empty;
2099 2099
2100 int ts = Util.EnvironmentTickCount();
2100 bool regionAccepted = scene.SimulationService.CreateAgent(reg, a, (uint)TeleportFlags.Default, out reason); 2101 bool regionAccepted = scene.SimulationService.CreateAgent(reg, a, (uint)TeleportFlags.Default, out reason);
2101 2102
2103// m_log.DebugFormat("[ENTITY TRANSFER MODULE] SimulationService.CreateAgent took {0}ms",Util.EnvironmentTickCountSubtract(ts));
2104
2102 if (regionAccepted && newAgent) 2105 if (regionAccepted && newAgent)
2103 { 2106 {
2104 // give some time for createAgent finish possible async tasks 2107 // give time for createAgent to finish, since it is async and does grid services access
2105 // does nothing usefull... out 2108
2106// int dly = 100 - sp.ControllingClient.PingTimeMS; 2109// int dly = 500 - sp.ControllingClient.PingTimeMS;
2107// if (dly > 20) 2110// if (dly > 20)
2108// Thread.Sleep(dly); 2111// Thread.Sleep(dly);
2112 // ping is unrealiable after a login :(, just delay a fair amount
2113
2114 Thread.Sleep(500);
2109 2115
2110 if (m_eqModule != null) 2116 if (m_eqModule != null)
2111 { 2117 {