diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index ee6cb04..53de269 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -268,7 +268,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
268 | if (sp.ParentID != (uint)0) | 268 | if (sp.ParentID != (uint)0) |
269 | sp.StandUp(); | 269 | sp.StandUp(); |
270 | 270 | ||
271 | m_log.Debug("XXX HERE 1"); | ||
272 | if (!sp.ValidateAttachments()) | 271 | if (!sp.ValidateAttachments()) |
273 | { | 272 | { |
274 | sp.ControllingClient.SendTeleportFailed("Inconsistent attachment state"); | 273 | sp.ControllingClient.SendTeleportFailed("Inconsistent attachment state"); |
@@ -351,7 +350,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
351 | // ES makes the client send a UseCircuitCode message to the destination, | 350 | // ES makes the client send a UseCircuitCode message to the destination, |
352 | // which triggers a bunch of things there. | 351 | // which triggers a bunch of things there. |
353 | // So let's wait | 352 | // So let's wait |
354 | Thread.Sleep(2000); | 353 | Thread.Sleep(200); |
355 | 354 | ||
356 | eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath); | 355 | eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath); |
357 | 356 | ||
@@ -428,13 +427,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
428 | return; | 427 | return; |
429 | } | 428 | } |
430 | 429 | ||
431 | KillEntity(sp.Scene, sp.LocalId); | ||
432 | |||
433 | sp.MakeChildAgent(); | ||
434 | 430 | ||
435 | // CrossAttachmentsIntoNewRegion is a synchronous call. We shouldn't need to wait after it | 431 | // CrossAttachmentsIntoNewRegion is a synchronous call. We shouldn't need to wait after it |
436 | CrossAttachmentsIntoNewRegion(finalDestination, sp, true); | 432 | CrossAttachmentsIntoNewRegion(finalDestination, sp, true); |
437 | 433 | ||
434 | KillEntity(sp.Scene, sp.LocalId); | ||
435 | |||
436 | sp.MakeChildAgent(); | ||
438 | // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone | 437 | // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone |
439 | 438 | ||
440 | if (NeedsClosing(oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) | 439 | if (NeedsClosing(oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) |