Starts to readd the changes from revisions 768,769 and 770 before Adam notices they got lost in the restructuring.

zircon^2
MW 2007-05-24 13:31:08 +00:00
parent f1af78d684
commit 5a6ee35df9
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)
{ {