* More attempts at fixing Ckrinke's phantom remoting error. Heh.

1 files changed, 16 insertions, 2 deletions

diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 520c593..e9affe5 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -58,12 +58,26 @@ namespace OpenSim.Region.Communications.OGS1
 
         public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
         {
-            return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
+            try
+            {
+                return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
+            }
+            catch (System.Runtime.Remoting.RemotingException e)
+            {
+                MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
+            }
         }
 
         public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
         {
-            return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
+            try
+            {
+                return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
+            }
+            catch (System.Runtime.Remoting.RemotingException e)
+            {
+                MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
+            }
         }
     }
 }