From a48d7f62a7e3af1aae2437668c484d4d0d1d92e5 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 27 May 2010 19:02:20 +0100
Subject: Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they
push more"
Some other stuff snuck in.
This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a.
---
OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs | 2 +-
.../Framework/EntityTransfer/EntityTransferModule.cs | 14 +-------------
OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | 14 +++++++-------
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 14 +++++++-------
4 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
index aa88836..bdbd284 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// the bucket, otherwise false</returns>
public bool RemoveTokens(int amount, out bool dripSucceeded)
{
- if (true) //maxBurst == 0)
+ if (maxBurst == 0)
{
dripSucceeded = true;
return true;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index fa49f9f..ef37f63 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -436,19 +436,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
KillEntity(sp.Scene, sp.LocalId);
- // MT wrapped this in a try because I've been seeing an
- // eception here, but no line number. Need to see if SP is
- // valid. This may move the exception to another place
- // where it can be debugged better.
- try
- {
- sp.MakeChildAgent();
- }
- catch(Exception e)
- {
- m_log.Error("Exception on MakeChildAgent: " + e.ToString());
- }
-
+ sp.MakeChildAgent();
// Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone
if (NeedsClosing(oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
index e50481a..17d7850 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
@@ -61,13 +61,13 @@ namespace OpenSim.Server.Handlers.Hypergrid
public Hashtable Handler(Hashtable request)
{
-// m_log.Debug("[CONNECTION DEBUGGING]: HomeAgentHandler Called");
-//
-// m_log.Debug("---------------------------");
-// m_log.Debug(" >> uri=" + request["uri"]);
-// m_log.Debug(" >> content-type=" + request["content-type"]);
-// m_log.Debug(" >> http-method=" + request["http-method"]);
-// m_log.Debug("---------------------------\n");
+ m_log.Debug("[CONNECTION DEBUGGING]: HomeAgentHandler Called");
+
+ m_log.Debug("---------------------------");
+ m_log.Debug(" >> uri=" + request["uri"]);
+ m_log.Debug(" >> content-type=" + request["content-type"]);
+ m_log.Debug(" >> http-method=" + request["http-method"]);
+ m_log.Debug("---------------------------\n");
Hashtable responsedata = new Hashtable();
responsedata["content_type"] = "text/html";
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 191acc9..ab3250d 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -61,13 +61,13 @@ namespace OpenSim.Server.Handlers.Simulation
public Hashtable Handler(Hashtable request)
{
-// m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
-//
-// m_log.Debug("---------------------------");
-// m_log.Debug(" >> uri=" + request["uri"]);
-// m_log.Debug(" >> content-type=" + request["content-type"]);
-// m_log.Debug(" >> http-method=" + request["http-method"]);
-// m_log.Debug("---------------------------\n");
+ m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
+
+ m_log.Debug("---------------------------");
+ m_log.Debug(" >> uri=" + request["uri"]);
+ m_log.Debug(" >> content-type=" + request["content-type"]);
+ m_log.Debug(" >> http-method=" + request["http-method"]);
+ m_log.Debug("---------------------------\n");
Hashtable responsedata = new Hashtable();
responsedata["content_type"] = "text/html";
--
cgit v1.1