From da85e84bafc9ae0b8350e480eb36b0c478f8d09a Mon Sep 17 00:00:00 2001 From: gareth Date: Sat, 10 Mar 2007 18:58:55 +0000 Subject: [PATCH] Filled out the login response data more Circuits tracking ready to implement sim authentication Sending CAPS --- userserver/src/UserHttp.cs | 24 +++++++++++++++++++++++- userserver/src/UserProfiles.cs | 20 ++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/userserver/src/UserHttp.cs b/userserver/src/UserHttp.cs index 0b4df69070..1830c51eac 100644 --- a/userserver/src/UserHttp.cs +++ b/userserver/src/UserHttp.cs @@ -110,13 +110,35 @@ namespace OpenGridServices LLUUID AgentID = TheUser.UUID; TheUser.InitSessionData(); + SimProfile SimInfo = new SimProfile(); + XmlRpcResponse LoginGoodResp = new XmlRpcResponse(); Hashtable LoginGoodData = new Hashtable(); - + + Hashtable GlobalTextures = new Hashtable(); + GlobalTextures["sun_texture_id"] = "cce0f112-878f-4586-a2e2-a8f104bba271"; + GlobalTextures["cloud_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621"; + GlobalTextures["moon_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621"; + + Hashtable LoginFlags = new Hashtable(); + LoginFlags["daylight_savings"]="N"; + LoginFlags["stipend_since_login"]="N"; + LoginFlags["gendered"]="Y"; + LoginFlags["ever_logged_in"]="Y"; + LoginGoodData["message"]=OpenUser_Main.userserver.DefaultStartupMsg; LoginGoodData["session_id"]=TheUser.CurrentSessionID; LoginGoodData["secure_sessionid"]=TheUser.CurrentSecureSessionID; + LoginGoodData["agent_access"]="M"; + LoginGoodData["start_location"]=requestData["start"]; + LoginGoodData["global_textures"]=GlobalTextures; + LoginGoodData["seconds_since_epoch"]=DateTime.Now; + LoginGoodData["firstname"]=firstname; + LoginGoodData["circuit_code"]=(new Random()).Next(); + LoginGoodData["login_flags"]=LoginFlags; + LoginGoodData["seed_capability"]="http://" + SimInfo.sim_ip + ":12043" + "/cap" + TheUser.CurrentSecureSessionID.Combine(TheUser.CurrentSessionID).Combine(AgentID); + LoginGoodResp.Value=LoginGoodData; return(XmlRpcResponseSerializer.Singleton.Serialize(LoginGoodResp)); diff --git a/userserver/src/UserProfiles.cs b/userserver/src/UserProfiles.cs index 6ef871c050..00866ff19e 100644 --- a/userserver/src/UserProfiles.cs +++ b/userserver/src/UserProfiles.cs @@ -142,4 +142,24 @@ namespace OpenGridServices public string Name; public string Description; } + + public class SimProfile { + public LLUUID UUID; + public ulong regionhandle; + public string regionname; + public string sim_ip; + public uint sim_port; + public string caps_url; + public uint RegionLocX; + public uint RegionLocY; + public string sendkey; + public string recvkey; + + + public SimProfile() { + } + + + } + }