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 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'OpenSim/Region')

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))
-- 
cgit v1.1