diff options
author | Melanie | 2010-05-27 19:02:20 +0100 |
---|---|---|
committer | Melanie | 2010-05-27 19:02:20 +0100 |
commit | a48d7f62a7e3af1aae2437668c484d4d0d1d92e5 (patch) | |
tree | dfcd0d42d1e5b179e55023ba64681529b29ec717 /OpenSim/Region | |
parent | Comment noisy "CONNECTION DEBUGGING" messages, because they push more (diff) | |
download | opensim-SC-a48d7f62a7e3af1aae2437668c484d4d0d1d92e5.zip opensim-SC-a48d7f62a7e3af1aae2437668c484d4d0d1d92e5.tar.gz opensim-SC-a48d7f62a7e3af1aae2437668c484d4d0d1d92e5.tar.bz2 opensim-SC-a48d7f62a7e3af1aae2437668c484d4d0d1d92e5.tar.xz |
Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more"
Some other stuff snuck in.
This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 14 |
2 files changed, 2 insertions, 14 deletions
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 | |||
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 (true) //maxBurst == 0) | 161 | if (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 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 | |||
436 | 436 | ||
437 | KillEntity(sp.Scene, sp.LocalId); | 437 | KillEntity(sp.Scene, sp.LocalId); |
438 | 438 | ||
439 | // MT wrapped this in a try because I've been seeing an | 439 | sp.MakeChildAgent(); |
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 | |||
452 | // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone | 440 | // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone |
453 | 441 | ||
454 | if (NeedsClosing(oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) | 442 | if (NeedsClosing(oldRegionX, newRegionX, oldRegionY, newRegionY, reg)) |