aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs14
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs14
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs14
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
158 /// the bucket, otherwise false</returns> 158 /// the bucket, otherwise false</returns>
159 public bool RemoveTokens(int amount, out bool dripSucceeded) 159 public bool RemoveTokens(int amount, out bool dripSucceeded)
160 { 160 {
161 if (maxBurst == 0) 161 if (true) //maxBurst == 0)
162 { 162 {
163 dripSucceeded = true; 163 dripSucceeded = true;
164 return true; 164 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
436 436
437 KillEntity(sp.Scene, sp.LocalId); 437 KillEntity(sp.Scene, sp.LocalId);
438 438
439 sp.MakeChildAgent(); 439 // MT wrapped this in a try because I've been seeing an
440 // eception here, but no line number. Need to see if SP is
441 // valid. This may move the exception to another place
442 // where it can be debugged better.
443 try
444 {
445 sp.MakeChildAgent();
446 }
447 catch(Exception e)
448 {
449 m_log.Error("Exception on MakeChildAgent: " + e.ToString());
450 }
451
440 // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone 452 // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone
441 453
442 if (NeedsClosing(oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) 454 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
61 61
62 public Hashtable Handler(Hashtable request) 62 public Hashtable Handler(Hashtable request)
63 { 63 {
64 m_log.Debug("[CONNECTION DEBUGGING]: HomeAgentHandler Called"); 64// m_log.Debug("[CONNECTION DEBUGGING]: HomeAgentHandler Called");
65 65//
66 m_log.Debug("---------------------------"); 66// m_log.Debug("---------------------------");
67 m_log.Debug(" >> uri=" + request["uri"]); 67// m_log.Debug(" >> uri=" + request["uri"]);
68 m_log.Debug(" >> content-type=" + request["content-type"]); 68// m_log.Debug(" >> content-type=" + request["content-type"]);
69 m_log.Debug(" >> http-method=" + request["http-method"]); 69// m_log.Debug(" >> http-method=" + request["http-method"]);
70 m_log.Debug("---------------------------\n"); 70// m_log.Debug("---------------------------\n");
71 71
72 Hashtable responsedata = new Hashtable(); 72 Hashtable responsedata = new Hashtable();
73 responsedata["content_type"] = "text/html"; 73 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
61 61
62 public Hashtable Handler(Hashtable request) 62 public Hashtable Handler(Hashtable request)
63 { 63 {
64 m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called"); 64// m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
65 65//
66 m_log.Debug("---------------------------"); 66// m_log.Debug("---------------------------");
67 m_log.Debug(" >> uri=" + request["uri"]); 67// m_log.Debug(" >> uri=" + request["uri"]);
68 m_log.Debug(" >> content-type=" + request["content-type"]); 68// m_log.Debug(" >> content-type=" + request["content-type"]);
69 m_log.Debug(" >> http-method=" + request["http-method"]); 69// m_log.Debug(" >> http-method=" + request["http-method"]);
70 m_log.Debug("---------------------------\n"); 70// m_log.Debug("---------------------------\n");
71 71
72 Hashtable responsedata = new Hashtable(); 72 Hashtable responsedata = new Hashtable();
73 responsedata["content_type"] = "text/html"; 73 responsedata["content_type"] = "text/html";