aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-05-08 21:36:51 +0200
committerMelanie2011-05-08 22:05:33 +0100
commite345f0389504df9b9cd6fd18ef0c275d3ee8ab0b (patch)
tree92b3ad894e4549e92b07866e33b293f0d54f1a54
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-e345f0389504df9b9cd6fd18ef0c275d3ee8ab0b.zip
opensim-SC_OLD-e345f0389504df9b9cd6fd18ef0c275d3ee8ab0b.tar.gz
opensim-SC_OLD-e345f0389504df9b9cd6fd18ef0c275d3ee8ab0b.tar.bz2
opensim-SC_OLD-e345f0389504df9b9cd6fd18ef0c275d3ee8ab0b.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 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
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
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);