* One hopefully-final attempt at fixing this remoting issue.

afrisby
Adam Frisby 2007-07-18 00:27:11 +00:00
parent be11cddc00
commit c52f9c04e2
1 changed files with 70 additions and 54 deletions

View File

@ -334,6 +334,8 @@ namespace OpenSim.Region.Communications.OGS1
/// <param name="agentData"></param> /// <param name="agentData"></param>
/// <returns></returns> /// <returns></returns>
public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
{
try
{ {
if (this.listeners.ContainsKey(regionHandle)) if (this.listeners.ContainsKey(regionHandle))
{ {
@ -367,6 +369,12 @@ namespace OpenSim.Region.Communications.OGS1
return false; return false;
} }
catch (System.Runtime.Remoting.RemotingException e)
{
MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
return false;
}
}
/// <summary> /// <summary>
/// ///
@ -376,6 +384,8 @@ namespace OpenSim.Region.Communications.OGS1
/// <param name="position"></param> /// <param name="position"></param>
/// <returns></returns> /// <returns></returns>
public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position) public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
{
try
{ {
if (this.listeners.ContainsKey(regionHandle)) if (this.listeners.ContainsKey(regionHandle))
{ {
@ -409,6 +419,12 @@ namespace OpenSim.Region.Communications.OGS1
// to inform it. // to inform it.
return false; return false;
} }
catch (System.Runtime.Remoting.RemotingException e)
{
MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
return false;
}
}
#endregion #endregion
#region Methods triggered by calls from external instances #region Methods triggered by calls from external instances