From 7b7267984a1d74e638e0931dc07cff06e43d4f58 Mon Sep 17 00:00:00 2001
From: Adam Frisby <adam@gwala.net>
Date: Tue, 17 Jul 2007 20:40:01 +0000
Subject: [PATCH] * Added exception handler to deal with RemotingExceptions for
 Child Agents.

---
 .../Region/Communications/OGS1/OGS1GridServices.cs  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 99e2b20e68..ce46043175 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -420,10 +420,17 @@ namespace OpenSim.Region.Communications.OGS1
         /// <returns></returns>
         public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)
         {
-            if (this.listeners.ContainsKey(regionHandle))
+            try
             {
-                this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
-                return true;
+                if (this.listeners.ContainsKey(regionHandle))
+                {
+                    this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
+                    return true;
+                }
+            }
+            catch (System.Runtime.Remoting.RemotingException e)
+            {
+                MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
             }
             return false;
         }