4 files changed, 28 insertions, 16 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))
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
index 17d7850..e50481a 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 ab3250d..191acc9 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";