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

* Temporary hack to swallow neighbour contact problems on startup (in response to osgrid issues) 

* Not sure what the effect will be, but can't be any worse than the current constant sim crashes.
0.6.0-stable
Justin Clarke Casey 2008-03-25 19:39:41 +00:00
parent 725b0a47e3
commit ed9cdbe99f
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,7 +226,17 @@ namespace OpenSim.Region.Communications.OGS1
uint port = Convert.ToUInt32(neighbourData["sim_port"]);
string externalUri = (string) neighbourData["sim_uri"];
string externalIpStr = Util.GetHostFromDNS(simIp).ToString();
string externalIpStr = String.Empty;
try
{
externalIpStr = Util.GetHostFromDNS(simIp).ToString();
}
catch (SocketException e)
{
m_log.WarnFormat("RequestNeighbours(): Lookup of neighbour {0} failed! Not including in neighbours list");
continue;
}
SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port);
sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]);

5
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -296,7 +296,10 @@ namespace OpenSim.Region.Environment.Scenes
// FIXME: Okay, even though we've failed, we're still going to throw the exception on,
// since I don't know what will happen if we just let the client continue
throw e;
// XXX: Well, decided to swallow the exception instead for now. Let us see how that goes.
// throw e;
}
}
}