aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2010-05-27 19:48:21 +0200
committerMelanie2010-05-27 18:44:15 +0100
commit6b6425aa5ee66df3e4cad3c4453854ff4a087aa8 (patch)
tree5856d8353aba1218e77321f063b99877dd42d1ac /OpenSim/Region
parentJust because there is an agent update handler, that doesn't mean there is (diff)
downloadopensim-SC_OLD-6b6425aa5ee66df3e4cad3c4453854ff4a087aa8.zip
opensim-SC_OLD-6b6425aa5ee66df3e4cad3c4453854ff4a087aa8.tar.gz
opensim-SC_OLD-6b6425aa5ee66df3e4cad3c4453854ff4a087aa8.tar.bz2
opensim-SC_OLD-6b6425aa5ee66df3e4cad3c4453854ff4a087aa8.tar.xz
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
important stuff off screen too fast
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs14
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
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))