diff options
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 79e323a..9796cf4 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
@@ -60,24 +60,24 @@ namespace OpenSim.Region.Communications.OGS1 | |||
60 | } | 60 | } |
61 | 61 | ||
62 | UserProfileData userData = new UserProfileData(); | 62 | UserProfileData userData = new UserProfileData(); |
63 | userData.username = (string) data["firstname"]; | 63 | userData.FirstName = (string) data["firstname"]; |
64 | userData.surname = (string) data["lastname"]; | 64 | userData.SurName = (string) data["lastname"]; |
65 | userData.UUID = new LLUUID((string) data["uuid"]); | 65 | userData.Id = new LLUUID((string) data["uuid"]); |
66 | userData.userInventoryURI = (string) data["server_inventory"]; | 66 | userData.UserInventoryURI = (string) data["server_inventory"]; |
67 | userData.userAssetURI = (string) data["server_asset"]; | 67 | userData.UserAssetURI = (string) data["server_asset"]; |
68 | userData.profileFirstText = (string) data["profile_firstlife_about"]; | 68 | userData.ProfileFirstText = (string) data["profile_firstlife_about"]; |
69 | userData.profileFirstImage = new LLUUID((string) data["profile_firstlife_image"]); | 69 | userData.ProfileFirstImage = new LLUUID((string) data["profile_firstlife_image"]); |
70 | userData.profileCanDoMask = Convert.ToUInt32((string) data["profile_can_do"]); | 70 | userData.ProfileCanDoMask = Convert.ToUInt32((string) data["profile_can_do"]); |
71 | userData.profileWantDoMask = Convert.ToUInt32(data["profile_want_do"]); | 71 | userData.ProfileWantDoMask = Convert.ToUInt32(data["profile_want_do"]); |
72 | userData.profileAboutText = (string)data["profile_about"]; | 72 | userData.ProfileAboutText = (string)data["profile_about"]; |
73 | userData.profileImage = new LLUUID((string) data["profile_image"]); | 73 | userData.ProfileImage = new LLUUID((string) data["profile_image"]); |
74 | userData.lastLogin = Convert.ToInt32((string) data["profile_lastlogin"]); | 74 | userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]); |
75 | userData.homeRegion = Convert.ToUInt64((string) data["home_region"]); | 75 | userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]); |
76 | userData.homeLocation = | 76 | userData.HomeLocation = |
77 | new LLVector3((float) Convert.ToDecimal((string) data["home_coordinates_x"]), | 77 | new LLVector3((float) Convert.ToDecimal((string) data["home_coordinates_x"]), |
78 | (float) Convert.ToDecimal((string) data["home_coordinates_y"]), | 78 | (float) Convert.ToDecimal((string) data["home_coordinates_y"]), |
79 | (float) Convert.ToDecimal((string) data["home_coordinates_z"])); | 79 | (float) Convert.ToDecimal((string) data["home_coordinates_z"])); |
80 | userData.homeLookAt = | 80 | userData.HomeLookAt = |
81 | new LLVector3((float) Convert.ToDecimal((string) data["home_look_x"]), | 81 | new LLVector3((float) Convert.ToDecimal((string) data["home_look_x"]), |
82 | (float) Convert.ToDecimal((string) data["home_look_y"]), | 82 | (float) Convert.ToDecimal((string) data["home_look_y"]), |
83 | (float) Convert.ToDecimal((string) data["home_look_z"])); | 83 | (float) Convert.ToDecimal((string) data["home_look_z"])); |
@@ -306,13 +306,13 @@ namespace OpenSim.Region.Communications.OGS1 | |||
306 | { | 306 | { |
307 | m_log.Debug("[OGS1 USER SERVICES]: Asking UserServer to update profile."); | 307 | m_log.Debug("[OGS1 USER SERVICES]: Asking UserServer to update profile."); |
308 | Hashtable param = new Hashtable(); | 308 | Hashtable param = new Hashtable(); |
309 | param["avatar_uuid"] = UserProfile.UUID.ToString(); | 309 | param["avatar_uuid"] = UserProfile.Id.ToString(); |
310 | //param["AllowPublish"] = UserProfile.ToString(); | 310 | //param["AllowPublish"] = UserProfile.ToString(); |
311 | param["FLImageID"] = UserProfile.profileFirstImage.ToString(); | 311 | param["FLImageID"] = UserProfile.ProfileFirstImage.ToString(); |
312 | param["ImageID"] = UserProfile.profileImage.ToString(); | 312 | param["ImageID"] = UserProfile.ProfileImage.ToString(); |
313 | //param["MaturePublish"] = MaturePublish.ToString(); | 313 | //param["MaturePublish"] = MaturePublish.ToString(); |
314 | param["AboutText"] = UserProfile.profileAboutText; | 314 | param["AboutText"] = UserProfile.ProfileAboutText; |
315 | param["FLAboutText"] = UserProfile.profileFirstText; | 315 | param["FLAboutText"] = UserProfile.ProfileFirstText; |
316 | //param["ProfileURL"] = UserProfile.ProfileURL.ToString(); | 316 | //param["ProfileURL"] = UserProfile.ProfileURL.ToString(); |
317 | IList parameters = new ArrayList(); | 317 | IList parameters = new ArrayList(); |
318 | parameters.Add(param); | 318 | parameters.Add(param); |