aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-05-08 21:36:51 +0200
committerMelanie2011-05-08 21:36:51 +0200
commit1fbf4c83004345891f7e09834a2fc35c33387ed9 (patch)
tree3160a3ecd7d62a689aeb291369b6973da8196585
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-1fbf4c83004345891f7e09834a2fc35c33387ed9.zip
opensim-SC_OLD-1fbf4c83004345891f7e09834a2fc35c33387ed9.tar.gz
opensim-SC_OLD-1fbf4c83004345891f7e09834a2fc35c33387ed9.tar.bz2
opensim-SC_OLD-1fbf4c83004345891f7e09834a2fc35c33387ed9.tar.xz
Remove a spammy debug I left in. Disable TP cancel button at the point
of no return.
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs3
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs1
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 0e5953e..1fb346e 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -329,7 +329,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
329 329
330 // Let's create an agent there if one doesn't exist yet. 330 // Let's create an agent there if one doesn't exist yet.
331 bool logout = false; 331 bool logout = false;
332 sp.ControllingClient.SendTeleportProgress(teleportFlags | (uint)TeleportFlags.DisableCancel, "Creating agent...");
333 if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout)) 332 if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout))
334 { 333 {
335 sp.ControllingClient.SendTeleportFailed(String.Format("Destination refused: {0}", 334 sp.ControllingClient.SendTeleportFailed(String.Format("Destination refused: {0}",
@@ -397,6 +396,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
397 return; 396 return;
398 } 397 }
399 398
399 sp.ControllingClient.SendTeleportProgress(teleportFlags | (uint)TeleportFlags.DisableCancel, "sending_dest");
400
400 m_log.DebugFormat( 401 m_log.DebugFormat(
401 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID); 402 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID);
402 403
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 55f011a..6d06cb8 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -90,7 +90,6 @@ namespace OpenSim.Server.Handlers.Simulation
90 90
91 // Next, let's parse the verb 91 // Next, let's parse the verb
92 string method = (string)request["http-method"]; 92 string method = (string)request["http-method"];
93 m_log.DebugFormat("[SIMULATION]: Got verb {0} in HTTP handler", method);
94 if (method.Equals("PUT")) 93 if (method.Equals("PUT"))
95 { 94 {
96 DoAgentPut(request, responsedata); 95 DoAgentPut(request, responsedata);