diff options
Diffstat (limited to 'OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs')
-rw-r--r-- | OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs b/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs index eee1c3a..b31feda 100644 --- a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs +++ b/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs | |||
@@ -30,8 +30,8 @@ namespace OpenSim.UserServer | |||
30 | 30 | ||
31 | public override void CustomiseResponse(ref System.Collections.Hashtable response, UserProfile theUser) | 31 | public override void CustomiseResponse(ref System.Collections.Hashtable response, UserProfile theUser) |
32 | { | 32 | { |
33 | uint circode = (uint)response["circuit_code"]; | 33 | Int32 circode = (Int32)response["circuit_code"]; |
34 | theUser.AddSimCircuit(circode, LLUUID.Random()); | 34 | theUser.AddSimCircuit((uint)circode, LLUUID.Random()); |
35 | response["home"] = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + theUser.homepos.X.ToString() + ",r" + theUser.homepos.Y.ToString() + ",r" + theUser.homepos.Z.ToString() + "], 'look_at':[r" + theUser.homelookat.X.ToString() + ",r" + theUser.homelookat.Y.ToString() + ",r" + theUser.homelookat.Z.ToString() + "]}"; | 35 | response["home"] = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + theUser.homepos.X.ToString() + ",r" + theUser.homepos.Y.ToString() + ",r" + theUser.homepos.Z.ToString() + "], 'look_at':[r" + theUser.homelookat.X.ToString() + ",r" + theUser.homelookat.Y.ToString() + ",r" + theUser.homelookat.Z.ToString() + "]}"; |
36 | response["sim_port"] = m_port; | 36 | response["sim_port"] = m_port; |
37 | response["sim_ip"] = m_ipAddr; | 37 | response["sim_ip"] = m_ipAddr; |
@@ -40,18 +40,18 @@ namespace OpenSim.UserServer | |||
40 | 40 | ||
41 | string first; | 41 | string first; |
42 | string last; | 42 | string last; |
43 | if (response.Contains("first")) | 43 | if (response.Contains("first_name")) |
44 | { | 44 | { |
45 | first = (string)response["first"]; | 45 | first = (string)response["first_name"]; |
46 | } | 46 | } |
47 | else | 47 | else |
48 | { | 48 | { |
49 | first = "test"; | 49 | first = "test"; |
50 | } | 50 | } |
51 | 51 | ||
52 | if (response.Contains("last")) | 52 | if (response.Contains("last_name")) |
53 | { | 53 | { |
54 | last = (string)response["last"]; | 54 | last = (string)response["last_name"]; |
55 | } | 55 | } |
56 | else | 56 | else |
57 | { | 57 | { |
@@ -67,12 +67,14 @@ namespace OpenSim.UserServer | |||
67 | _login.Last = last; | 67 | _login.Last = last; |
68 | _login.Agent = new LLUUID((string)response["agent_id"]) ; | 68 | _login.Agent = new LLUUID((string)response["agent_id"]) ; |
69 | _login.Session = new LLUUID((string)response["session_id"]); | 69 | _login.Session = new LLUUID((string)response["session_id"]); |
70 | _login.SecureSession = new LLUUID((string)response["secure_session_id"]); | ||
70 | _login.BaseFolder = null; | 71 | _login.BaseFolder = null; |
71 | _login.InventoryFolder = new LLUUID((string)Inventory1["folder_id"]); | 72 | _login.InventoryFolder = new LLUUID((string)Inventory1["folder_id"]); |
72 | 73 | ||
73 | //working on local computer if so lets add to the gridserver's list of sessions? | 74 | //working on local computer if so lets add to the gridserver's list of sessions? |
74 | if (m_gridServer.GetName() == "Local") | 75 | if (m_gridServer.GetName() == "Local") |
75 | { | 76 | { |
77 | Console.WriteLine("adding login data to gridserver"); | ||
76 | ((LocalGridBase)this.m_gridServer).AddNewSession(_login); | 78 | ((LocalGridBase)this.m_gridServer).AddNewSession(_login); |
77 | } | 79 | } |
78 | } | 80 | } |