OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more" 

Some other stuff snuck in.

This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a.
soprefactor
Melanie 2010-05-27 19:02:20 +01:00
parent 6b6425aa5e
commit a48d7f62a7
4 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
View File

@ -158,7 +158,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// the bucket, otherwise false</returns> /// the bucket, otherwise false</returns>
public bool RemoveTokens(int amount, out bool dripSucceeded) public bool RemoveTokens(int amount, out bool dripSucceeded)
{ {
if (true) //maxBurst == 0) if (maxBurst == 0)
{ {
dripSucceeded = true; dripSucceeded = true;
return true; return true;

12
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -436,19 +436,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
KillEntity(sp.Scene, sp.LocalId); 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(); sp.MakeChildAgent();
}
catch(Exception e)
{
m_log.Error("Exception on MakeChildAgent: " + e.ToString());
}
// Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone // 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)) if (NeedsClosing(oldRegionX, newRegionX, oldRegionY, newRegionY, reg))

14
OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
View File

@ -61,13 +61,13 @@ namespace OpenSim.Server.Handlers.Hypergrid
public Hashtable Handler(Hashtable request) public Hashtable Handler(Hashtable request)
{ {
// m_log.Debug("[CONNECTION DEBUGGING]: HomeAgentHandler Called"); m_log.Debug("[CONNECTION DEBUGGING]: HomeAgentHandler Called");
//
// m_log.Debug("---------------------------"); m_log.Debug("---------------------------");
// m_log.Debug(" >> uri=" + request["uri"]); m_log.Debug(" >> uri=" + request["uri"]);
// m_log.Debug(" >> content-type=" + request["content-type"]); m_log.Debug(" >> content-type=" + request["content-type"]);
// m_log.Debug(" >> http-method=" + request["http-method"]); m_log.Debug(" >> http-method=" + request["http-method"]);
// m_log.Debug("---------------------------\n"); m_log.Debug("---------------------------\n");
Hashtable responsedata = new Hashtable(); Hashtable responsedata = new Hashtable();
responsedata["content_type"] = "text/html"; responsedata["content_type"] = "text/html";

14
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
View File

@ -61,13 +61,13 @@ namespace OpenSim.Server.Handlers.Simulation
public Hashtable Handler(Hashtable request) public Hashtable Handler(Hashtable request)
{ {
// m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called"); m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
//
// m_log.Debug("---------------------------"); m_log.Debug("---------------------------");
// m_log.Debug(" >> uri=" + request["uri"]); m_log.Debug(" >> uri=" + request["uri"]);
// m_log.Debug(" >> content-type=" + request["content-type"]); m_log.Debug(" >> content-type=" + request["content-type"]);
// m_log.Debug(" >> http-method=" + request["http-method"]); m_log.Debug(" >> http-method=" + request["http-method"]);
// m_log.Debug("---------------------------\n"); m_log.Debug("---------------------------\n");
Hashtable responsedata = new Hashtable(); Hashtable responsedata = new Hashtable();
responsedata["content_type"] = "text/html"; responsedata["content_type"] = "text/html";