1 files changed, 42 insertions, 42 deletions
diff --git a/OpenSim.RegionServer/SimClient.Grid.cs b/OpenSim.RegionServer/SimClient.Grid.cs
index 755a79c..493d4d7 100644
--- a/OpenSim.RegionServer/SimClient.Grid.cs
+++ b/OpenSim.RegionServer/SimClient.Grid.cs
@@ -33,48 +33,48 @@ namespace OpenSim
                RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer;
-                    foreach (Hashtable neighbour in gridServer.neighbours)
+                foreach (Hashtable neighbour in gridServer.neighbours)
-                    {
+                {
-                        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);
-                        ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);
+                    ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);
-                        string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();
+                    string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();
-                        
-                        Console.WriteLine(reqUrl);
+                    Console.WriteLine(reqUrl);
-                        
-                        SimParams = new Hashtable();
+                    SimParams = new Hashtable();
-                        SimParams["session_id"] = this.SessionID.ToString();
+                    SimParams["session_id"] = this.SessionID.ToString();
-                        SimParams["secure_session_id"] = this.SecureSessionID.ToString();
+                    SimParams["secure_session_id"] = this.SecureSessionID.ToString();
-                        SimParams["firstname"] = this.ClientAvatar.firstname;
+                    SimParams["firstname"] = this.ClientAvatar.firstname;
-                        SimParams["lastname"] = this.ClientAvatar.lastname;
+                    SimParams["lastname"] = this.ClientAvatar.lastname;
-                        SimParams["agent_id"] = this.AgentID.ToString();
+                    SimParams["agent_id"] = this.AgentID.ToString();
-                        SimParams["circuit_code"] = (Int32)this.CircuitCode;
+                    SimParams["circuit_code"] = (Int32)this.CircuitCode;
-                        SimParams["child_agent"] = "1";
+                    SimParams["child_agent"] = "1";
-                        SendParams = new ArrayList();
+                    SendParams = new ArrayList();
-                        SendParams.Add(SimParams);
+                    SendParams.Add(SimParams);
-                        GridReq = new XmlRpcRequest("expect_user", SendParams);
+                    GridReq = new XmlRpcRequest("expect_user", SendParams);
-                        GridResp = GridReq.Send(reqUrl, 3000);
+                    GridResp = GridReq.Send(reqUrl, 3000);
-                        EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
+                    EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
-                        enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
+                    enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
-                        enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));
+                    enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));
-                        
-                        
-                        byte[] byteIP = neighbourIP.GetAddressBytes();
+                    byte[] byteIP = neighbourIP.GetAddressBytes();
-                        enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;
+                    enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;
-                        enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;
+                    enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;
-                        enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
+                    enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
-                        enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
+                    enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
-                        enablesimpacket.SimulatorInfo.Port = neighbourPort;
+                    enablesimpacket.SimulatorInfo.Port = neighbourPort;
-                        enablePackets.Add(enablesimpacket);
+                    enablePackets.Add(enablesimpacket);
-                    }
+                }
-                    Thread.Sleep(3000);
+                Thread.Sleep(3000);
-                    foreach (Packet enable in enablePackets)
+                foreach (Packet enable in enablePackets)
-                    {
+                {
-                        this.OutPacket(enable);
+                    this.OutPacket(enable);
-                    }
+                }
-                    enablePackets.Clear();
+                enablePackets.Clear();
-                
            }
        }

diff --git a/OpenSim.RegionServer/SimClient.Grid.cs b/OpenSim.RegionServer/SimClient.Grid.cs index 755a79c..493d4d7 100644 --- a/OpenSim.RegionServer/SimClient.Grid.cs +++ b/OpenSim.RegionServer/SimClient.Grid.cs
@@ -33,48 +33,48 @@ namespace OpenSim
33		33
34	RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer;	34	RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer;
35		35
36	foreach (Hashtable neighbour in gridServer.neighbours)	36	foreach (Hashtable neighbour in gridServer.neighbours)
37	{	37	{
38	string neighbourIPStr = (string)neighbour["sim_ip"];	38	string neighbourIPStr = (string)neighbour["sim_ip"];
39	System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr);	39	System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr);
40	ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);	40	ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);
41	string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();	41	string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();
42		42
43	Console.WriteLine(reqUrl);	43	Console.WriteLine(reqUrl);
44		44
45	SimParams = new Hashtable();	45	SimParams = new Hashtable();
46	SimParams["session_id"] = this.SessionID.ToString();	46	SimParams["session_id"] = this.SessionID.ToString();
47	SimParams["secure_session_id"] = this.SecureSessionID.ToString();	47	SimParams["secure_session_id"] = this.SecureSessionID.ToString();
48	SimParams["firstname"] = this.ClientAvatar.firstname;	48	SimParams["firstname"] = this.ClientAvatar.firstname;
49	SimParams["lastname"] = this.ClientAvatar.lastname;	49	SimParams["lastname"] = this.ClientAvatar.lastname;
50	SimParams["agent_id"] = this.AgentID.ToString();	50	SimParams["agent_id"] = this.AgentID.ToString();
51	SimParams["circuit_code"] = (Int32)this.CircuitCode;	51	SimParams["circuit_code"] = (Int32)this.CircuitCode;
52	SimParams["child_agent"] = "1";	52	SimParams["child_agent"] = "1";
53	SendParams = new ArrayList();	53	SendParams = new ArrayList();
54	SendParams.Add(SimParams);	54	SendParams.Add(SimParams);
55		55
56	GridReq = new XmlRpcRequest("expect_user", SendParams);	56	GridReq = new XmlRpcRequest("expect_user", SendParams);
57	GridResp = GridReq.Send(reqUrl, 3000);	57	GridResp = GridReq.Send(reqUrl, 3000);
58	EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();	58	EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
59	enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();	59	enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
60	enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));	60	enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));
61		61
62		62
63	byte[] byteIP = neighbourIP.GetAddressBytes();	63	byte[] byteIP = neighbourIP.GetAddressBytes();
64	enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;	64	enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;
65	enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;	65	enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;
66	enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;	66	enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
67	enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];	67	enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
68	enablesimpacket.SimulatorInfo.Port = neighbourPort;	68	enablesimpacket.SimulatorInfo.Port = neighbourPort;
69	enablePackets.Add(enablesimpacket);	69	enablePackets.Add(enablesimpacket);
70	}	70	}
71	Thread.Sleep(3000);	71	Thread.Sleep(3000);
72	foreach (Packet enable in enablePackets)	72	foreach (Packet enable in enablePackets)
73	{	73	{
74	this.OutPacket(enable);	74	this.OutPacket(enable);
75	}	75	}
76	enablePackets.Clear();	76	enablePackets.Clear();
77		77
78	}	78	}
79	}	79	}
80		80