OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

merge
MW 2007-05-31 12:12:26 +00:00
parent 33b8fe52d6
commit e89654424a
2 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
View File

@ -19,28 +19,6 @@ namespace OpenSim
public XmlRpcResponse ExpectUser(XmlRpcRequest request) 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(); return new XmlRpcResponse();
} }
} }

19
OpenSim/OpenSim/OpenSimMain.cs
View File

@ -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 // 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/", httpServer.AddRestHandler("GET", "/simstatus/",
delegate(string request, string path, string param) delegate(string request, string path, string param)