* Added exception handler to deal with RemotingExceptions for Child Agents.

1 files changed, 10 insertions, 3 deletions

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 99e2b20..ce46043 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;
         }