aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index da3a541..6e4ec81 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -328,7 +328,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
328 328
329 // Let's create an agent there if one doesn't exist yet. 329 // Let's create an agent there if one doesn't exist yet.
330 bool logout = false; 330 bool logout = false;
331 sp.ControllingClient.SendTeleportProgress(teleportFlags | (uint)TeleportFlags.DisableCancel, "Creating agent...");
332 if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout)) 331 if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout))
333 { 332 {
334 sp.ControllingClient.SendTeleportFailed(String.Format("Destination refused: {0}", 333 sp.ControllingClient.SendTeleportFailed(String.Format("Destination refused: {0}",
@@ -396,6 +395,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
396 return; 395 return;
397 } 396 }
398 397
398 sp.ControllingClient.SendTeleportProgress(teleportFlags | (uint)TeleportFlags.DisableCancel, "sending_dest");
399
399 m_log.DebugFormat( 400 m_log.DebugFormat(
400 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID); 401 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID);
401 402