* Simulators should no longer require all their neighbours to be online to accept user connections.

zircon^2
Adam Frisby 2007-05-24 02:36:07 +00:00
parent 4e7e63b551
commit 9fcffee76b
1 changed files with 34 additions and 27 deletions

View File

@ -34,6 +34,8 @@ namespace OpenSim
RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer; RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer;
foreach (Hashtable neighbour in gridServer.neighbours) foreach (Hashtable neighbour in gridServer.neighbours)
{
try
{ {
string neighbourIPStr = (string)neighbour["sim_ip"]; string neighbourIPStr = (string)neighbour["sim_ip"];
System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr); System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr);
@ -68,6 +70,11 @@ namespace OpenSim
enablesimpacket.SimulatorInfo.Port = neighbourPort; enablesimpacket.SimulatorInfo.Port = neighbourPort;
enablePackets.Add(enablesimpacket); enablePackets.Add(enablesimpacket);
} }
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Could not connect to neighbour " + neighbour["sim_ip"] + ":" + neighbour["sim_port"] + ", continuing.");
}
}
Thread.Sleep(3000); Thread.Sleep(3000);
foreach (Packet enable in enablePackets) foreach (Packet enable in enablePackets)
{ {