From 6b6425aa5ee66df3e4cad3c4453854ff4a087aa8 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 27 May 2010 19:48:21 +0200
Subject: Comment noisy "CONNECTION DEBUGGING" messages, because they push more
 important stuff off screen too fast

---
 .../Framework/EntityTransfer/EntityTransferModule.cs       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')

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))
-- 
cgit v1.1