Die AuthenticateSessionsRemote. hrrm okay don't die, just partially die

2 files changed, 1 insertions, 40 deletions

diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
index 80cd9d3..13bce0e 100644
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
+++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
@@ -19,28 +19,6 @@ namespace OpenSim
 

         public XmlRpcResponse ExpectUser(XmlRpcRequest request)

         {

-            Hashtable requestData = (Hashtable)request.Params[0];

-            AgentCircuitData agentData = new AgentCircuitData();

-            agentData.SessionID = new LLUUID((string)requestData["session_id"]);

-            agentData.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);

-            agentData.firstname = (string)requestData["firstname"];

-            agentData.lastname = (string)requestData["lastname"];

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

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

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

-            {

-                agentData.child = true;

-            }

-            else

-            {

-                agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));

-                agentData.child = false;

-               // Console.WriteLine("expect user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);

-          

-            }

-

-            this.AddNewCircuit(agentData.circuitcode, agentData);

-

             return new XmlRpcResponse();

         }

     }

diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 7c3bca4..4aa48bd 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -261,24 +261,7 @@ namespace OpenSim
             {

 

                 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server

-                httpServer.AddXmlRPCHandler("expect_user", ((AuthenticateSessionsRemote)this.AuthenticateSessionsHandler[0]).ExpectUser);

-

-                httpServer.AddXmlRPCHandler("agent_crossing",

-                    delegate(XmlRpcRequest request)

-                    {

-                        Hashtable requestData = (Hashtable)request.Params[0];

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

-

-                        AgentCircuitData agent_data = new AgentCircuitData();

-                        agent_data.firstname = (string)requestData["firstname"];

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

-                        agent_data.circuitcode = circuitcode;

-                        agent_data.startpos = new LLVector3(Single.Parse((string)requestData["pos_x"]), Single.Parse((string)requestData["pos_y"]), Single.Parse((string)requestData["pos_z"]));

-

-                        AuthenticateSessionsHandler[0].UpdateAgentData(agent_data);

-

-                        return new XmlRpcResponse();

-                    });

+               

 

                 httpServer.AddRestHandler("GET", "/simstatus/",

                     delegate(string request, string path, string param)