W00t! multiple sims!

Misc bugfixes
Child agents!!!!!!
General sexy stuff

1 files changed, 56 insertions, 5 deletions

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 8c93128..f10ca34 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -48,7 +48,7 @@ using OpenSim.Framework.Console;
 using OpenSim.Physics.Manager;

 using Nwc.XmlRpc;

 using OpenSim.Servers;

-using OpenSim.GenericConfig;

+using OpenSim.GenericConfig;
 

 namespace OpenSim

 {

@@ -164,6 +164,18 @@ namespace OpenSim
             GridServers.AssetServer.SetServerInfo(regionData.AssetURL, regionData.AssetSendKey);

             IGridServer gridServer = GridServers.GridServer;

             gridServer.SetServerInfo(regionData.GridURL, regionData.GridSendKey, regionData.GridRecvKey);

+
+            if(!m_sandbox) {
+                    if(GridServers.GridServer.RequestConnection(regionData.SimUUID,regionData.IPListenAddr,(uint)regionData.IPListenPort)) {
+                        m_console.WriteLine("Main.cs:Startup() - Got a grid connection OK!");
+                    } else {
+                        m_console.WriteLine("AAAAAAAAAAAAARRRRRRRRRRGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!");
+                        m_console.WriteLine("I LOST MY GRID!!!!!!!!!!!!! AAAAAAAARRRRRRRRGGGGGGGGHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!");
+                        Shutdown();
+                    }
+            }
+
+            GridServers.AssetServer.SetServerInfo((string)((RemoteGridBase)GridServers.GridServer).GridData["asset_url"], (string)((RemoteGridBase)GridServers.GridServer).GridData["asset_sendkey"]); 
 

             LocalWorld.LoadPrimsFromStorage();

 

@@ -190,9 +202,11 @@ namespace OpenSim
                         agent_data.firstname = (string)requestData["firstname"];

                         agent_data.lastname = (string)requestData["lastname"];

                         agent_data.AgentID = new LLUUID((string)requestData["agent_id"]);

-                        agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);

-

-                        ((RemoteGridBase)gridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data);

+                        agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
+                        if(requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1")) {
+                                agent_data.child=true;
+                        }

+                        ((RemoteGridBase)gridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data);
 

                         return new XmlRpcResponse();

                     });

@@ -288,15 +302,52 @@ namespace OpenSim
             }

             else if (packet.Type == PacketType.UseCircuitCode)

             { // new client

+
                 UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet;

                 this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);

-                SimClient newuser = new SimClient(epSender, useCircuit, LocalWorld, _packetServer.ClientThreads, AssetCache, GridServers.GridServer, this, InventoryCache, m_sandbox);

+                SimClient newuser = new SimClient(epSender, useCircuit, LocalWorld, _packetServer.ClientThreads, AssetCache, GridServers.GridServer, this, InventoryCache, m_sandbox,((RemoteGridBase)this.GridServers.GridServer).agentcircuits[useCircuit.CircuitCode.Code].child);

                 if ((this.GridServers.UserServer != null) && (user_accounts))

                 {

                     newuser.UserServer = this.GridServers.UserServer;

                 }

                 //OpenSimRoot.Instance.ClientThreads.Add(epSender, newuser);

                 this._packetServer.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);

+
+                if(!((RemoteGridBase)GridServers.GridServer).agentcircuits[useCircuit.CircuitCode.Code].child) {
+                        Hashtable SimParams;
+                        ArrayList SendParams;
+                        XmlRpcRequest GridReq;
+                        XmlRpcResponse GridResp;
+                        foreach (Hashtable neighbour in ((RemoteGridBase)this.GridServers.GridServer).neighbours) {
+                                m_console.WriteLine("http://" + neighbour["sim_ip"] + ":" + neighbour["sim_port"]);
+                                SimParams = new Hashtable();

+                                SimParams["session_id"] = ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[useCircuit.CircuitCode.Code].SessionID.ToString();

+                                SimParams["secure_session_id"] = ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[useCircuit.CircuitCode.Code].SecureSessionID.ToString();

+                                SimParams["firstname"] = ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[useCircuit.CircuitCode.Code].firstname;

+                                SimParams["lastname"] = ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[useCircuit.CircuitCode.Code].lastname;

+                                SimParams["agent_id"] = ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[useCircuit.CircuitCode.Code].AgentID.ToString();

+                                SimParams["circuit_code"] = (Int32)useCircuit.CircuitCode.Code;

+                                SimParams["child_agent"]="1";                           
+                                SendParams = new ArrayList();

+                                SendParams.Add(SimParams);

+

+                                GridReq = new XmlRpcRequest("expect_user", SendParams);

+                                GridResp = GridReq.Send("http://" + neighbour["sim_ip"] + ":" + neighbour["sim_port"], 3000);

+                                EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
+                                enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
+                                enablesimpacket.SimulatorInfo.Handle=Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));
+                                System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse((string)neighbour["sim_ip"]);
+                                byte[] byteIP = neighbourIP.GetAddressBytes();
+                                enablesimpacket.SimulatorInfo.IP=(uint)byteIP[3]<<24;
+                                enablesimpacket.SimulatorInfo.IP+=(uint)byteIP[2]<<16;
+                                enablesimpacket.SimulatorInfo.IP+=(uint)byteIP[1]<<8;
+                                enablesimpacket.SimulatorInfo.IP+=(uint)byteIP[0];
+                                enablesimpacket.SimulatorInfo.Port=(ushort)Convert.ToInt32(neighbour["sim_port"]);
+                                Thread.Sleep(3000);
+                                _packetServer.ClientThreads[useCircuit.CircuitCode.Code].OutPacket(enablesimpacket);
+                        }
+                }
+
             }

             else

             { // invalid client