aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorlbsa712007-10-05 13:54:16 +0000
committerlbsa712007-10-05 13:54:16 +0000
commitd4a4aafaf15360c0f5db22145a60bae87e6bb9c6 (patch)
tree72915aa8a9f3777a52fe8677c764a192d448e492 /OpenSim/Grid
parent* minor refactoring (diff)
downloadopensim-SC-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.zip
opensim-SC-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.gz
opensim-SC-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.bz2
opensim-SC-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.xz
* So, ok, maybe renaming serialized fields on a friday wasn't the smartest of things. Reverting 2056.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs26
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs38
2 files changed, 32 insertions, 32 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 120d90c..b42427b 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.Firstname; 58 SimParams["firstname"] = theUser.username;
59 SimParams["lastname"] = theUser.Lastname; 59 SimParams["lastname"] = theUser.surname;
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
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index c2d0a7a..5db4901 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -83,31 +83,31 @@ namespace OpenSim.Grid.UserServer
83 Hashtable responseData = new Hashtable(); 83 Hashtable responseData = new Hashtable();
84 84
85 // Account information 85 // Account information
86 responseData["firstname"] = profile.Firstname; 86 responseData["firstname"] = profile.username;
87 responseData["lastname"] = profile.Lastname; 87 responseData["lastname"] = profile.surname;
88 responseData["uuid"] = profile.UUID.ToStringHyphenated(); 88 responseData["uuid"] = profile.UUID.ToStringHyphenated();
89 // Server Information 89 // Server Information
90 responseData["server_inventory"] = profile.UserInventoryUri; 90 responseData["server_inventory"] = profile.userInventoryURI;
91 responseData["server_asset"] = profile.UserAssetUri; 91 responseData["server_asset"] = profile.userAssetURI;
92 // Profile Information 92 // Profile Information
93 responseData["profile_about"] = profile.ProfileAboutText; 93 responseData["profile_about"] = profile.profileAboutText;
94 responseData["profile_firstlife_about"] = profile.ProfileFirstText; 94 responseData["profile_firstlife_about"] = profile.profileFirstText;
95 responseData["profile_firstlife_image"] = profile.ProfileFirstImage.ToStringHyphenated(); 95 responseData["profile_firstlife_image"] = profile.profileFirstImage.ToStringHyphenated();
96 responseData["profile_can_do"] = profile.ProfileCanDoMask.ToString(); 96 responseData["profile_can_do"] = profile.profileCanDoMask.ToString();
97 responseData["profile_want_do"] = profile.ProfileWantDoMask.ToString(); 97 responseData["profile_want_do"] = profile.profileWantDoMask.ToString();
98 responseData["profile_image"] = profile.ProfileImage.ToStringHyphenated(); 98 responseData["profile_image"] = profile.profileImage.ToStringHyphenated();
99 responseData["profile_created"] = profile.Created.ToString(); 99 responseData["profile_created"] = profile.created.ToString();
100 responseData["profile_lastlogin"] = profile.LastLogin.ToString(); 100 responseData["profile_lastlogin"] = profile.lastLogin.ToString();
101 // Home region information 101 // Home region information
102 responseData["home_coordinates_x"] = profile.HomeLocation.X.ToString(); 102 responseData["home_coordinates_x"] = profile.homeLocation.X.ToString();
103 responseData["home_coordinates_y"] = profile.HomeLocation.Y.ToString(); 103 responseData["home_coordinates_y"] = profile.homeLocation.Y.ToString();
104 responseData["home_coordinates_z"] = profile.HomeLocation.Z.ToString(); 104 responseData["home_coordinates_z"] = profile.homeLocation.Z.ToString();
105 105
106 responseData["home_region"] = profile.HomeRegion.ToString(); 106 responseData["home_region"] = profile.homeRegion.ToString();
107 107
108 responseData["home_look_x"] = profile.HomeLookAt.X.ToString(); 108 responseData["home_look_x"] = profile.homeLookAt.X.ToString();
109 responseData["home_look_y"] = profile.HomeLookAt.Y.ToString(); 109 responseData["home_look_y"] = profile.homeLookAt.Y.ToString();
110 responseData["home_look_z"] = profile.HomeLookAt.Z.ToString(); 110 responseData["home_look_z"] = profile.homeLookAt.Z.ToString();
111 response.Value = responseData; 111 response.Value = responseData;
112 112
113 return response; 113 return response;