1 files changed, 13 insertions, 1 deletions

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))