diff options
author | Justin Clarke Casey | 2008-03-25 19:39:41 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-03-25 19:39:41 +0000 |
commit | ed9cdbe99f8c108925417e53f7cf85bff4434491 (patch) | |
tree | 936f2494ac951c04014454a75630013dd4b3dd1e /OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |
parent | Set svn:ignore. (diff) | |
download | opensim-SC-ed9cdbe99f8c108925417e53f7cf85bff4434491.zip opensim-SC-ed9cdbe99f8c108925417e53f7cf85bff4434491.tar.gz opensim-SC-ed9cdbe99f8c108925417e53f7cf85bff4434491.tar.bz2 opensim-SC-ed9cdbe99f8c108925417e53f7cf85bff4434491.tar.xz |
* 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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 23b8fb4..a783050 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -226,7 +226,17 @@ namespace OpenSim.Region.Communications.OGS1 | |||
226 | uint port = Convert.ToUInt32(neighbourData["sim_port"]); | 226 | uint port = Convert.ToUInt32(neighbourData["sim_port"]); |
227 | string externalUri = (string) neighbourData["sim_uri"]; | 227 | string externalUri = (string) neighbourData["sim_uri"]; |
228 | 228 | ||
229 | string externalIpStr = Util.GetHostFromDNS(simIp).ToString(); | 229 | string externalIpStr = String.Empty; |
230 | try | ||
231 | { | ||
232 | externalIpStr = Util.GetHostFromDNS(simIp).ToString(); | ||
233 | } | ||
234 | catch (SocketException e) | ||
235 | { | ||
236 | m_log.WarnFormat("RequestNeighbours(): Lookup of neighbour {0} failed! Not including in neighbours list"); | ||
237 | continue; | ||
238 | } | ||
239 | |||
230 | SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port); | 240 | SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port); |
231 | 241 | ||
232 | sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]); | 242 | sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]); |