diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index b42427b..120d90c 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -29,13 +29,13 @@ namespace OpenSim.Grid.UserServer | |||
29 | { | 29 | { |
30 | // Load information from the gridserver | 30 | // Load information from the gridserver |
31 | SimProfileData SimInfo = new SimProfileData(); | 31 | SimProfileData SimInfo = new SimProfileData(); |
32 | SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey); | 32 | SimInfo = SimInfo.RequestSimProfileData(theUser.CurrentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey); |
33 | 33 | ||
34 | // Customise the response | 34 | // Customise the response |
35 | // Home Location | 35 | // Home Location |
36 | response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + (SimInfo.regionLocY * 256).ToString() + "], " + | 36 | response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + (SimInfo.regionLocY * 256).ToString() + "], " + |
37 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + | 37 | "'position':[r" + theUser.HomeLocation.X.ToString() + ",r" + theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "], " + |
38 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; | 38 | "'look_at':[r" + theUser.HomeLocation.X.ToString() + ",r" + theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "]}"; |
39 | 39 | ||
40 | // Destination | 40 | // Destination |
41 | Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY); | 41 | Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY); |
@@ -53,23 +53,23 @@ namespace OpenSim.Grid.UserServer | |||
53 | 53 | ||
54 | // Prepare notification | 54 | // Prepare notification |
55 | Hashtable SimParams = new Hashtable(); | 55 | Hashtable SimParams = new Hashtable(); |
56 | SimParams["session_id"] = theUser.currentAgent.sessionID.ToString(); | 56 | SimParams["session_id"] = theUser.CurrentAgent.sessionID.ToString(); |
57 | SimParams["secure_session_id"] = theUser.currentAgent.secureSessionID.ToString(); | 57 | SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); |
58 | SimParams["firstname"] = theUser.username; | 58 | SimParams["firstname"] = theUser.Firstname; |
59 | SimParams["lastname"] = theUser.surname; | 59 | SimParams["lastname"] = theUser.Lastname; |
60 | SimParams["agent_id"] = theUser.UUID.ToString(); | 60 | SimParams["agent_id"] = theUser.UUID.ToString(); |
61 | SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response.CircuitCode); | 61 | SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response.CircuitCode); |
62 | SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString(); | 62 | SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString(); |
63 | SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString(); | 63 | SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString(); |
64 | SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString(); | 64 | SimParams["startpos_z"] = theUser.CurrentAgent.currentPos.Z.ToString(); |
65 | SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString(); | 65 | SimParams["regionhandle"] = theUser.CurrentAgent.currentHandle.ToString(); |
66 | SimParams["caps_path"] = capsPath; | 66 | SimParams["caps_path"] = capsPath; |
67 | ArrayList SendParams = new ArrayList(); | 67 | ArrayList SendParams = new ArrayList(); |
68 | SendParams.Add(SimParams); | 68 | SendParams.Add(SimParams); |
69 | 69 | ||
70 | // Update agent with target sim | 70 | // Update agent with target sim |
71 | theUser.currentAgent.currentRegion = SimInfo.UUID; | 71 | theUser.CurrentAgent.currentRegion = SimInfo.UUID; |
72 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; | 72 | theUser.CurrentAgent.currentHandle = SimInfo.regionHandle; |
73 | 73 | ||
74 | System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI); | 74 | System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI); |
75 | // Send | 75 | // Send |