From 17929abd28ffdf764155dede0f2bcfded40cbcf9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 3 Apr 2014 00:33:43 +0100
Subject: Wrap contents of ETM.CrossAgentToNewRegionAsync() in try/catch to
 avoid a failure terminating simulators running on Windows

In relation to http://opensimulator.org/mantis/view.php?id=7050
---
 .../EntityTransfer/EntityTransferModule.cs         | 32 +++++++++++++---------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework')

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index c9adc37..62b5a01 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1629,24 +1629,30 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                 ScenePresence agent, Vector3 pos, GridRegion neighbourRegion,
                                 bool isFlying, string version)
         {
-            m_log.DebugFormat("{0} CrossAgentToNewRegionAsync: new region={1} at <{2},{3}>. newpos={4}",
-                        LogHeader, neighbourRegion.RegionName, neighbourRegion.RegionLocX, neighbourRegion.RegionLocY, pos);
-
-            if (!CrossAgentToNewRegionPrep(agent, neighbourRegion))
+            try
             {
-                m_log.DebugFormat("{0} CrossAgentToNewRegionAsync: prep failed. Resetting transfer state", LogHeader);
-                m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
-                return agent;
-            }
+                m_log.DebugFormat("{0}: CrossAgentToNewRegionAsync: new region={1} at <{2},{3}>. newpos={4}",
+                            LogHeader, neighbourRegion.RegionName, neighbourRegion.RegionLocX, neighbourRegion.RegionLocY, pos);
+
+                if (!CrossAgentToNewRegionPrep(agent, neighbourRegion))
+                {
+                    m_log.DebugFormat("{0}: CrossAgentToNewRegionAsync: prep failed. Resetting transfer state", LogHeader);
+                    m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
+                }
 
-            if (!CrossAgentIntoNewRegionMain(agent, pos, neighbourRegion, isFlying))
+                if (!CrossAgentIntoNewRegionMain(agent, pos, neighbourRegion, isFlying))
+                {
+                    m_log.DebugFormat("{0}: CrossAgentToNewRegionAsync: cross main failed. Resetting transfer state", LogHeader);
+                    m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
+                }
+
+                CrossAgentToNewRegionPost(agent, pos, neighbourRegion, isFlying, version);
+            }
+            catch (Exception e)
             {
-                m_log.DebugFormat("{0} CrossAgentToNewRegionAsync: cross main failed. Resetting transfer state", LogHeader);
-                m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
-                return agent;
+                m_log.Error(string.Format("{0}: CrossAgentToNewRegionAsync: failed with exception  ", LogHeader), e);
             }
 
-            CrossAgentToNewRegionPost(agent, pos, neighbourRegion, isFlying, version);
             return agent;
         }
 
-- 
cgit v1.1