Sim crossing now works (except for broken co-ordinates, resets to 0,0 - to be fixed soon)

Fixed sandbox mode fully
Scrapped former XML-RPC expect_user call for sim crossings
Sim client thread can upgrade/downgrade between full and child agent dynamically

1 files changed, 15 insertions, 8 deletions

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 2492ee2..038c7e6 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -67,7 +67,7 @@ namespace OpenSim
         //private Dictionary<uint, SimClient> ClientThreads = new Dictionary<uint, SimClient>();

         private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();

         private DateTime startuptime;

-        private RegionInfo regionData;

+        public RegionInfo regionData;

 

         public Socket Server;

         private IPEndPoint ServerIncoming;

@@ -206,12 +206,19 @@ 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"]);

-                        if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))

-                        {

-                            agent_data.child = true;

-                        }

-                        ((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;
+                        } else {
+                                agent_data.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]),Convert.ToUInt32(requestData["startpos_y"]),Convert.ToUInt32(requestData["startpos_z"]));
+                                agent_data.child=false;
+                        }

+                        
+                        if(((RemoteGridBase)gridServer).agentcircuits.ContainsKey((uint)agent_data.circuitcode)) {
+                                ((RemoteGridBase)gridServer).agentcircuits[(uint)agent_data.circuitcode]=agent_data;
+                        } else {
+                                ((RemoteGridBase)gridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data);
+                        }
 

                         return new XmlRpcResponse();

                     });

@@ -286,7 +293,7 @@ namespace OpenSim
             pluginAssembly = null;

             return config;

         }

-

+
         private void OnReceivedData(IAsyncResult result)

         {

             ipeSender = new IPEndPoint(IPAddress.Any, 0);