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

important stuff off screen too fast

2 files changed, 14 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
index bdbd284..aa88836 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 (maxBurst == 0)
+            if (true) //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 ef37f63..fa49f9f 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -436,7 +436,19 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 KillEntity(sp.Scene, sp.LocalId);
 
-                sp.MakeChildAgent();
+                // 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());
+                }
+
                 // 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))