OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -334,6 +334,8 @@ namespace OpenSim.Region.Communications.OGS1
/// <param name="agentData"></param>
/// <returns></returns>
public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
{
try
{
if (this.listeners.ContainsKey(regionHandle))
{
@ -349,7 +351,7 @@ namespace OpenSim.Region.Communications.OGS1
OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject(
typeof(OGS1InterRegionRemoting),
"tcp://"+ regInfo.RemotingAddress+":"+regInfo.RemotingPort+"/InterRegions");
"tcp://" + regInfo.RemotingAddress + ":" + regInfo.RemotingPort + "/InterRegions");
if (remObject != null)
{
@ -367,6 +369,12 @@ namespace OpenSim.Region.Communications.OGS1
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>
///
@ -376,6 +384,8 @@ namespace OpenSim.Region.Communications.OGS1
/// <param name="position"></param>
/// <returns></returns>
public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
{
try
{
if (this.listeners.ContainsKey(regionHandle))
{
@ -409,6 +419,12 @@ namespace OpenSim.Region.Communications.OGS1
// to inform it.
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
#region Methods triggered by calls from external instances