aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs22
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs19
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
19 19
20 public XmlRpcResponse ExpectUser(XmlRpcRequest request) 20 public XmlRpcResponse ExpectUser(XmlRpcRequest request)
21 { 21 {
22 Hashtable requestData = (Hashtable)request.Params[0];
23 AgentCircuitData agentData = new AgentCircuitData();
24 agentData.SessionID = new LLUUID((string)requestData["session_id"]);
25 agentData.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);
26 agentData.firstname = (string)requestData["firstname"];
27 agentData.lastname = (string)requestData["lastname"];
28 agentData.AgentID = new LLUUID((string)requestData["agent_id"]);
29 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
30 if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
31 {
32 agentData.child = true;
33 }
34 else
35 {
36 agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));
37 agentData.child = false;
38 // Console.WriteLine("expect user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
39
40 }
41
42 this.AddNewCircuit(agentData.circuitcode, agentData);
43
44 return new XmlRpcResponse(); 22 return new XmlRpcResponse();
45 } 23 }
46 } 24 }
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
261 { 261 {
262 262
263 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server 263 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
264 httpServer.AddXmlRPCHandler("expect_user", ((AuthenticateSessionsRemote)this.AuthenticateSessionsHandler[0]).ExpectUser); 264
265
266 httpServer.AddXmlRPCHandler("agent_crossing",
267 delegate(XmlRpcRequest request)
268 {
269 Hashtable requestData = (Hashtable)request.Params[0];
270 uint circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
271
272 AgentCircuitData agent_data = new AgentCircuitData();
273 agent_data.firstname = (string)requestData["firstname"];
274 agent_data.lastname = (string)requestData["lastname"];
275 agent_data.circuitcode = circuitcode;
276 agent_data.startpos = new LLVector3(Single.Parse((string)requestData["pos_x"]), Single.Parse((string)requestData["pos_y"]), Single.Parse((string)requestData["pos_z"]));
277
278 AuthenticateSessionsHandler[0].UpdateAgentData(agent_data);
279
280 return new XmlRpcResponse();
281 });
282 265
283 httpServer.AddRestHandler("GET", "/simstatus/", 266 httpServer.AddRestHandler("GET", "/simstatus/",
284 delegate(string request, string path, string param) 267 delegate(string request, string path, string param)