diff options
author | Sean Dague | 2008-04-10 14:09:30 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-10 14:09:30 +0000 |
commit | 25fea01b92a7682e10f57ce979217d31fee975ef (patch) | |
tree | 0e0dec2344cd06609bf47f1a7e2245a0a94f99c6 /OpenSim/Grid | |
parent | moved fields to properties for UserDataProfile, which was (diff) | |
download | opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.zip opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.gz opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.bz2 opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.xz |
further renaming of properties for clarity
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 8 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 22 |
2 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index f655415..141aa3e 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -177,7 +177,7 @@ namespace OpenSim.Grid.UserServer | |||
177 | SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); | 177 | SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); |
178 | SimParams["firstname"] = theUser.FirstName; | 178 | SimParams["firstname"] = theUser.FirstName; |
179 | SimParams["lastname"] = theUser.SurName; | 179 | SimParams["lastname"] = theUser.SurName; |
180 | SimParams["agent_id"] = theUser.Id.ToString(); | 180 | SimParams["agent_id"] = theUser.ID.ToString(); |
181 | SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode); | 181 | SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode); |
182 | SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString(); | 182 | SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString(); |
183 | SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString(); | 183 | SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString(); |
@@ -206,7 +206,7 @@ namespace OpenSim.Grid.UserServer | |||
206 | if (handlerUserLoggedInAtLocation != null) | 206 | if (handlerUserLoggedInAtLocation != null) |
207 | { | 207 | { |
208 | m_log.Info("[LOGIN]: Letting other objects know about login"); | 208 | m_log.Info("[LOGIN]: Letting other objects know about login"); |
209 | handlerUserLoggedInAtLocation(theUser.Id, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, | 209 | handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, |
210 | theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X,theUser.CurrentAgent.currentPos.Y,theUser.CurrentAgent.currentPos.Z, | 210 | theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X,theUser.CurrentAgent.currentPos.Y,theUser.CurrentAgent.currentPos.Z, |
211 | theUser.FirstName,theUser.SurName); | 211 | theUser.FirstName,theUser.SurName); |
212 | } | 212 | } |
@@ -268,7 +268,7 @@ namespace OpenSim.Grid.UserServer | |||
268 | SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); | 268 | SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); |
269 | SimParams["firstname"] = theUser.FirstName; | 269 | SimParams["firstname"] = theUser.FirstName; |
270 | SimParams["lastname"] = theUser.SurName; | 270 | SimParams["lastname"] = theUser.SurName; |
271 | SimParams["agent_id"] = theUser.Id.ToString(); | 271 | SimParams["agent_id"] = theUser.ID.ToString(); |
272 | SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode); | 272 | SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode); |
273 | SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString(); | 273 | SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString(); |
274 | SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString(); | 274 | SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString(); |
@@ -286,7 +286,7 @@ namespace OpenSim.Grid.UserServer | |||
286 | if (handlerUserLoggedInAtLocation != null) | 286 | if (handlerUserLoggedInAtLocation != null) |
287 | { | 287 | { |
288 | m_log.Info("[LOGIN]: Letting other objects know about login"); | 288 | m_log.Info("[LOGIN]: Letting other objects know about login"); |
289 | handlerUserLoggedInAtLocation(theUser.Id, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, | 289 | handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, |
290 | theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X, theUser.CurrentAgent.currentPos.Y, theUser.CurrentAgent.currentPos.Z, | 290 | theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X, theUser.CurrentAgent.currentPos.Y, theUser.CurrentAgent.currentPos.Z, |
291 | theUser.FirstName, theUser.SurName); | 291 | theUser.FirstName, theUser.SurName); |
292 | } | 292 | } |
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index cf05bfd..cf3f8d8 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -127,17 +127,17 @@ namespace OpenSim.Grid.UserServer | |||
127 | // Account information | 127 | // Account information |
128 | responseData["firstname"] = profile.FirstName; | 128 | responseData["firstname"] = profile.FirstName; |
129 | responseData["lastname"] = profile.SurName; | 129 | responseData["lastname"] = profile.SurName; |
130 | responseData["uuid"] = profile.Id.ToString(); | 130 | responseData["uuid"] = profile.ID.ToString(); |
131 | // Server Information | 131 | // Server Information |
132 | responseData["server_inventory"] = profile.UserInventoryURI; | 132 | responseData["server_inventory"] = profile.UserInventoryURI; |
133 | responseData["server_asset"] = profile.UserAssetURI; | 133 | responseData["server_asset"] = profile.UserAssetURI; |
134 | // Profile Information | 134 | // Profile Information |
135 | responseData["profile_about"] = profile.ProfileAboutText; | 135 | responseData["profile_about"] = profile.AboutText; |
136 | responseData["profile_firstlife_about"] = profile.ProfileFirstText; | 136 | responseData["profile_firstlife_about"] = profile.FirstLifeAboutText; |
137 | responseData["profile_firstlife_image"] = profile.ProfileFirstImage.ToString(); | 137 | responseData["profile_firstlife_image"] = profile.FirstLifeImage.ToString(); |
138 | responseData["profile_can_do"] = profile.ProfileCanDoMask.ToString(); | 138 | responseData["profile_can_do"] = profile.CanDoMask.ToString(); |
139 | responseData["profile_want_do"] = profile.ProfileWantDoMask.ToString(); | 139 | responseData["profile_want_do"] = profile.WantDoMask.ToString(); |
140 | responseData["profile_image"] = profile.ProfileImage.ToString(); | 140 | responseData["profile_image"] = profile.Image.ToString(); |
141 | responseData["profile_created"] = profile.Created.ToString(); | 141 | responseData["profile_created"] = profile.Created.ToString(); |
142 | responseData["profile_lastlogin"] = profile.LastLogin.ToString(); | 142 | responseData["profile_lastlogin"] = profile.LastLogin.ToString(); |
143 | // Home region information | 143 | // Home region information |
@@ -341,11 +341,11 @@ namespace OpenSim.Grid.UserServer | |||
341 | } | 341 | } |
342 | if (requestData.Contains("FLImageID")) | 342 | if (requestData.Contains("FLImageID")) |
343 | { | 343 | { |
344 | userProfile.ProfileFirstImage = new LLUUID((string)requestData["FLImageID"]); | 344 | userProfile.FirstLifeImage = new LLUUID((string)requestData["FLImageID"]); |
345 | } | 345 | } |
346 | if (requestData.Contains("ImageID")) | 346 | if (requestData.Contains("ImageID")) |
347 | { | 347 | { |
348 | userProfile.ProfileImage = new LLUUID((string)requestData["ImageID"]); | 348 | userProfile.Image = new LLUUID((string)requestData["ImageID"]); |
349 | } | 349 | } |
350 | // dont' know how yet | 350 | // dont' know how yet |
351 | if (requestData.Contains("MaturePublish")) | 351 | if (requestData.Contains("MaturePublish")) |
@@ -353,11 +353,11 @@ namespace OpenSim.Grid.UserServer | |||
353 | } | 353 | } |
354 | if (requestData.Contains("AboutText")) | 354 | if (requestData.Contains("AboutText")) |
355 | { | 355 | { |
356 | userProfile.ProfileAboutText = (string)requestData["AboutText"]; | 356 | userProfile.AboutText = (string)requestData["AboutText"]; |
357 | } | 357 | } |
358 | if (requestData.Contains("FLAboutText")) | 358 | if (requestData.Contains("FLAboutText")) |
359 | { | 359 | { |
360 | userProfile.ProfileFirstText = (string)requestData["FLAboutText"]; | 360 | userProfile.FirstLifeAboutText = (string)requestData["FLAboutText"]; |
361 | } | 361 | } |
362 | // not in DB yet. | 362 | // not in DB yet. |
363 | if (requestData.Contains("ProfileURL")) | 363 | if (requestData.Contains("ProfileURL")) |