From e345f0389504df9b9cd6fd18ef0c275d3ee8ab0b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 8 May 2011 21:36:51 +0200
Subject: Remove a spammy debug I left in. Disable TP cancel button at the
 point of no return.

---
 .../CoreModules/Framework/EntityTransfer/EntityTransferModule.cs       | 3 ++-
 OpenSim/Server/Handlers/Simulation/AgentHandlers.cs                    | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

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
 
                 // Let's create an agent there if one doesn't exist yet. 
                 bool logout = false;
-                sp.ControllingClient.SendTeleportProgress(teleportFlags | (uint)TeleportFlags.DisableCancel, "Creating agent...");
                 if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout))
                 {
                     sp.ControllingClient.SendTeleportFailed(String.Format("Destination refused: {0}",
@@ -396,6 +395,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     return;
                 }
 
+                sp.ControllingClient.SendTeleportProgress(teleportFlags | (uint)TeleportFlags.DisableCancel, "sending_dest");
+
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID);
 
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index d52750b..21b26df 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -90,7 +90,6 @@ namespace OpenSim.Server.Handlers.Simulation
 
             // Next, let's parse the verb
             string method = (string)request["http-method"];
-            m_log.DebugFormat("[SIMULATION]: Got verb {0} in HTTP handler", method);
             if (method.Equals("PUT"))
             {
                 DoAgentPut(request, responsedata);
-- 
cgit v1.1