diff options
author | UbitUmarov | 2014-08-15 21:26:50 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-15 21:26:50 +0100 |
commit | 72a6bca033f95fa00c9fb21e0a7086f7c3d23f99 (patch) | |
tree | b6b9f2a028f1911484f558b69970c82216d0945c | |
parent | do CrossAttachmentsIntoNewRegion for old versions in the right place (diff) | |
download | opensim-SC-72a6bca033f95fa00c9fb21e0a7086f7c3d23f99.zip opensim-SC-72a6bca033f95fa00c9fb21e0a7086f7c3d23f99.tar.gz opensim-SC-72a6bca033f95fa00c9fb21e0a7086f7c3d23f99.tar.bz2 opensim-SC-72a6bca033f95fa00c9fb21e0a7086f7c3d23f99.tar.xz |
cleanup a bit
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 84ca52d..7846400 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -2108,20 +2108,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2108 | 2108 | ||
2109 | string reason = String.Empty; | 2109 | string reason = String.Empty; |
2110 | 2110 | ||
2111 | int ts = Util.EnvironmentTickCount(); | ||
2112 | bool regionAccepted = scene.SimulationService.CreateAgent(reg, a, (uint)TeleportFlags.Default, out reason); | 2111 | bool regionAccepted = scene.SimulationService.CreateAgent(reg, a, (uint)TeleportFlags.Default, out reason); |
2113 | 2112 | ||
2114 | // m_log.DebugFormat("[ENTITY TRANSFER MODULE] SimulationService.CreateAgent took {0}ms",Util.EnvironmentTickCountSubtract(ts)); | ||
2115 | |||
2116 | if (regionAccepted && newAgent) | 2113 | if (regionAccepted && newAgent) |
2117 | { | 2114 | { |
2118 | // give time for createAgent to finish, since it is async and does grid services access | 2115 | // give time for createAgent to finish, since it is async and does grid services access |
2119 | |||
2120 | // int dly = 500 - sp.ControllingClient.PingTimeMS; | ||
2121 | // if (dly > 20) | ||
2122 | // Thread.Sleep(dly); | ||
2123 | // ping is unrealiable after a login :(, just delay a fair amount | ||
2124 | |||
2125 | Thread.Sleep(500); | 2116 | Thread.Sleep(500); |
2126 | 2117 | ||
2127 | if (m_eqModule != null) | 2118 | if (m_eqModule != null) |