aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-07-18 00:02:09 +0000
committerAdam Frisby2007-07-18 00:02:09 +0000
commit3d0d7cb74cf37c40d119570148d217a6478e3e0e (patch)
treed94873c4fe62a22c2eea9d50927b52b2c4e00c63
parent* Fixing compile (diff)
downloadopensim-SC_OLD-3d0d7cb74cf37c40d119570148d217a6478e3e0e.zip
opensim-SC_OLD-3d0d7cb74cf37c40d119570148d217a6478e3e0e.tar.gz
opensim-SC_OLD-3d0d7cb74cf37c40d119570148d217a6478e3e0e.tar.bz2
opensim-SC_OLD-3d0d7cb74cf37c40d119570148d217a6478e3e0e.tar.xz
* More attempts at fixing Ckrinke's phantom remoting error. Heh.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs18
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
58 58
59 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) 59 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
60 { 60 {
61 return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData); 61 try
62 {
63 return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
64 }
65 catch (System.Runtime.Remoting.RemotingException e)
66 {
67 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
68 }
62 } 69 }
63 70
64 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position) 71 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
65 { 72 {
66 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position); 73 try
74 {
75 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
76 }
77 catch (System.Runtime.Remoting.RemotingException e)
78 {
79 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
80 }
67 } 81 }
68 } 82 }
69} 83}