diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLManager.cs | 34 | ||||
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLUserData.cs | 6 |
2 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs index a83ee45..e733a83 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs | |||
@@ -313,36 +313,36 @@ namespace OpenSim.Framework.Data.MySQL | |||
313 | if (reader.Read()) | 313 | if (reader.Read()) |
314 | { | 314 | { |
315 | retval.UUID = new LLUUID((string)reader["UUID"]); | 315 | retval.UUID = new LLUUID((string)reader["UUID"]); |
316 | retval.username = (string)reader["username"]; | 316 | retval.Firstname = (string)reader["username"]; |
317 | retval.surname = (string)reader["lastname"]; | 317 | retval.Lastname = (string)reader["lastname"]; |
318 | 318 | ||
319 | retval.passwordHash = (string)reader["passwordHash"]; | 319 | retval.PasswordHash = (string)reader["passwordHash"]; |
320 | retval.passwordSalt = (string)reader["passwordSalt"]; | 320 | retval.PasswordSalt = (string)reader["passwordSalt"]; |
321 | 321 | ||
322 | retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString()); | 322 | retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString()); |
323 | retval.homeLocation = new LLVector3( | 323 | retval.HomeLocation = new LLVector3( |
324 | Convert.ToSingle(reader["homeLocationX"].ToString()), | 324 | Convert.ToSingle(reader["homeLocationX"].ToString()), |
325 | Convert.ToSingle(reader["homeLocationY"].ToString()), | 325 | Convert.ToSingle(reader["homeLocationY"].ToString()), |
326 | Convert.ToSingle(reader["homeLocationZ"].ToString())); | 326 | Convert.ToSingle(reader["homeLocationZ"].ToString())); |
327 | retval.homeLookAt = new LLVector3( | 327 | retval.HomeLookAt = new LLVector3( |
328 | Convert.ToSingle(reader["homeLookAtX"].ToString()), | 328 | Convert.ToSingle(reader["homeLookAtX"].ToString()), |
329 | Convert.ToSingle(reader["homeLookAtY"].ToString()), | 329 | Convert.ToSingle(reader["homeLookAtY"].ToString()), |
330 | Convert.ToSingle(reader["homeLookAtZ"].ToString())); | 330 | Convert.ToSingle(reader["homeLookAtZ"].ToString())); |
331 | 331 | ||
332 | retval.created = Convert.ToInt32(reader["created"].ToString()); | 332 | retval.Created = Convert.ToInt32(reader["created"].ToString()); |
333 | retval.lastLogin = Convert.ToInt32(reader["lastLogin"].ToString()); | 333 | retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString()); |
334 | 334 | ||
335 | retval.userInventoryURI = (string)reader["userInventoryURI"]; | 335 | retval.UserInventoryUri = (string)reader["userInventoryURI"]; |
336 | retval.userAssetURI = (string)reader["userAssetURI"]; | 336 | retval.UserAssetUri = (string)reader["userAssetURI"]; |
337 | 337 | ||
338 | retval.profileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString()); | 338 | retval.ProfileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString()); |
339 | retval.profileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString()); | 339 | retval.ProfileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString()); |
340 | 340 | ||
341 | retval.profileAboutText = (string)reader["profileAboutText"]; | 341 | retval.ProfileAboutText = (string)reader["profileAboutText"]; |
342 | retval.profileFirstText = (string)reader["profileFirstText"]; | 342 | retval.ProfileFirstText = (string)reader["profileFirstText"]; |
343 | 343 | ||
344 | retval.profileImage = new LLUUID((string)reader["profileImage"]); | 344 | retval.ProfileImage = new LLUUID((string)reader["profileImage"]); |
345 | retval.profileFirstImage = new LLUUID((string)reader["profileFirstImage"]); | 345 | retval.ProfileFirstImage = new LLUUID((string)reader["profileFirstImage"]); |
346 | 346 | ||
347 | } | 347 | } |
348 | else | 348 | else |
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs index 301550f..ae24367 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs | |||
@@ -204,9 +204,9 @@ namespace OpenSim.Framework.Data.MySQL | |||
204 | { | 204 | { |
205 | lock (database) | 205 | lock (database) |
206 | { | 206 | { |
207 | database.insertUserRow(user.UUID, user.username, user.surname, user.passwordHash, user.passwordSalt, user.homeRegion, user.homeLocation.X, user.homeLocation.Y, user.homeLocation.Z, | 207 | database.insertUserRow(user.UUID, user.Firstname, user.Lastname, user.PasswordHash, user.PasswordSalt, user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, user.HomeLocation.Z, |
208 | user.homeLookAt.X, user.homeLookAt.Y, user.homeLookAt.Z, user.created, user.lastLogin, user.userInventoryURI, user.userAssetURI, user.profileCanDoMask, user.profileWantDoMask, | 208 | user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin, user.UserInventoryUri, user.UserAssetUri, user.ProfileCanDoMask, user.ProfileWantDoMask, |
209 | user.profileAboutText, user.profileFirstText, user.profileImage, user.profileFirstImage); | 209 | user.ProfileAboutText, user.ProfileFirstText, user.ProfileImage, user.ProfileFirstImage); |
210 | } | 210 | } |
211 | } | 211 | } |
212 | catch (Exception e) | 212 | catch (Exception e) |