aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
authorAdam Frisby2007-07-17 20:40:01 +0000
committerAdam Frisby2007-07-17 20:40:01 +0000
commit7b7267984a1d74e638e0931dc07cff06e43d4f58 (patch)
treeabcd4d2dd9a28096748bcad59417ca9cad4b90c9 /OpenSim/Region/Communications/OGS1
parent* Applying babblefrog's DNS patches from issue #188 (diff)
downloadopensim-SC_OLD-7b7267984a1d74e638e0931dc07cff06e43d4f58.zip
opensim-SC_OLD-7b7267984a1d74e638e0931dc07cff06e43d4f58.tar.gz
opensim-SC_OLD-7b7267984a1d74e638e0931dc07cff06e43d4f58.tar.bz2
opensim-SC_OLD-7b7267984a1d74e638e0931dc07cff06e43d4f58.tar.xz
* Added exception handler to deal with RemotingExceptions for Child Agents.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs13
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
420 /// <returns></returns> 420 /// <returns></returns>
421 public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) 421 public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)
422 { 422 {
423 if (this.listeners.ContainsKey(regionHandle)) 423 try
424 { 424 {
425 this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData); 425 if (this.listeners.ContainsKey(regionHandle))
426 return true; 426 {
427 this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
428 return true;
429 }
430 }
431 catch (System.Runtime.Remoting.RemotingException e)
432 {
433 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
427 } 434 }
428 return false; 435 return false;
429 } 436 }