aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL/MSSQLUserData.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs68
1 files changed, 34 insertions, 34 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index c045084..aae0095 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -453,7 +453,7 @@ namespace OpenSim.Data.MSSQL
453 override public UserAgentData GetAgentByName(string user, string last) 453 override public UserAgentData GetAgentByName(string user, string last)
454 { 454 {
455 UserProfileData profile = GetUserByName(user, last); 455 UserProfileData profile = GetUserByName(user, last);
456 return GetAgentByUUID(profile.UUID); 456 return GetAgentByUUID(profile.Id);
457 } 457 }
458 458
459 /// <summary> 459 /// <summary>
@@ -491,7 +491,7 @@ namespace OpenSim.Data.MSSQL
491 override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) 491 override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
492 { 492 {
493 UserProfileData user = GetUserByUUID(AgentID); 493 UserProfileData user = GetUserByUUID(AgentID);
494 user.webLoginKey = WebLoginKey; 494 user.WebLoginKey = WebLoginKey;
495 UpdateUserProfile(user); 495 UpdateUserProfile(user);
496 496
497 } 497 }
@@ -505,14 +505,14 @@ namespace OpenSim.Data.MSSQL
505 { 505 {
506 lock (database) 506 lock (database)
507 { 507 {
508 InsertUserRow(user.UUID, user.username, user.surname, user.passwordHash, user.passwordSalt, 508 InsertUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
509 user.homeRegion, user.homeLocation.X, user.homeLocation.Y, 509 user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y,
510 user.homeLocation.Z, 510 user.HomeLocation.Z,
511 user.homeLookAt.X, user.homeLookAt.Y, user.homeLookAt.Z, user.created, 511 user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
512 user.lastLogin, user.userInventoryURI, user.userAssetURI, 512 user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
513 user.profileCanDoMask, user.profileWantDoMask, 513 user.ProfileCanDoMask, user.ProfileWantDoMask,
514 user.profileAboutText, user.profileFirstText, user.profileImage, 514 user.ProfileAboutText, user.ProfileFirstText, user.ProfileImage,
515 user.profileFirstImage, user.webLoginKey); 515 user.ProfileFirstImage, user.WebLoginKey);
516 } 516 }
517 } 517 }
518 catch (Exception e) 518 catch (Exception e)
@@ -651,30 +651,30 @@ namespace OpenSim.Data.MSSQL
651 "profileFirstImage = @profileFirstImage, " + 651 "profileFirstImage = @profileFirstImage, " +
652 "webLoginKey = @webLoginKey where " + 652 "webLoginKey = @webLoginKey where " +
653 "UUID = @keyUUUID;", database.getConnection()); 653 "UUID = @keyUUUID;", database.getConnection());
654 SqlParameter param1 = new SqlParameter("@uuid", user.UUID.ToString()); 654 SqlParameter param1 = new SqlParameter("@uuid", user.Id.ToString());
655 SqlParameter param2 = new SqlParameter("@username", user.username); 655 SqlParameter param2 = new SqlParameter("@username", user.FirstName);
656 SqlParameter param3 = new SqlParameter("@lastname", user.surname); 656 SqlParameter param3 = new SqlParameter("@lastname", user.SurName);
657 SqlParameter param4 = new SqlParameter("@passwordHash", user.passwordHash); 657 SqlParameter param4 = new SqlParameter("@passwordHash", user.PasswordHash);
658 SqlParameter param5 = new SqlParameter("@passwordSalt", user.passwordSalt); 658 SqlParameter param5 = new SqlParameter("@passwordSalt", user.PasswordSalt);
659 SqlParameter param6 = new SqlParameter("@homeRegion", Convert.ToInt64(user.homeRegion)); 659 SqlParameter param6 = new SqlParameter("@homeRegion", Convert.ToInt64(user.HomeRegion));
660 SqlParameter param7 = new SqlParameter("@homeLocationX", user.homeLocation.X); 660 SqlParameter param7 = new SqlParameter("@homeLocationX", user.HomeLocation.X);
661 SqlParameter param8 = new SqlParameter("@homeLocationY", user.homeLocation.Y); 661 SqlParameter param8 = new SqlParameter("@homeLocationY", user.HomeLocation.Y);
662 SqlParameter param9 = new SqlParameter("@homeLocationZ", user.homeLocation.Y); 662 SqlParameter param9 = new SqlParameter("@homeLocationZ", user.HomeLocation.Y);
663 SqlParameter param10 = new SqlParameter("@homeLookAtX", user.homeLookAt.X); 663 SqlParameter param10 = new SqlParameter("@homeLookAtX", user.HomeLookAt.X);
664 SqlParameter param11 = new SqlParameter("@homeLookAtY", user.homeLookAt.Y); 664 SqlParameter param11 = new SqlParameter("@homeLookAtY", user.HomeLookAt.Y);
665 SqlParameter param12 = new SqlParameter("@homeLookAtZ", user.homeLookAt.Z); 665 SqlParameter param12 = new SqlParameter("@homeLookAtZ", user.HomeLookAt.Z);
666 SqlParameter param13 = new SqlParameter("@created", Convert.ToInt32(user.created)); 666 SqlParameter param13 = new SqlParameter("@created", Convert.ToInt32(user.Created));
667 SqlParameter param14 = new SqlParameter("@lastLogin", Convert.ToInt32(user.lastLogin)); 667 SqlParameter param14 = new SqlParameter("@lastLogin", Convert.ToInt32(user.LastLogin));
668 SqlParameter param15 = new SqlParameter("@userInventoryURI", user.userInventoryURI); 668 SqlParameter param15 = new SqlParameter("@userInventoryURI", user.UserInventoryURI);
669 SqlParameter param16 = new SqlParameter("@userAssetURI", user.userAssetURI); 669 SqlParameter param16 = new SqlParameter("@userAssetURI", user.UserAssetURI);
670 SqlParameter param17 = new SqlParameter("@profileCanDoMask", Convert.ToInt32(user.profileCanDoMask)); 670 SqlParameter param17 = new SqlParameter("@profileCanDoMask", Convert.ToInt32(user.ProfileCanDoMask));
671 SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.profileWantDoMask)); 671 SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.ProfileWantDoMask));
672 SqlParameter param19 = new SqlParameter("@profileAboutText", user.profileAboutText); 672 SqlParameter param19 = new SqlParameter("@profileAboutText", user.ProfileAboutText);
673 SqlParameter param20 = new SqlParameter("@profileFirstText", user.profileFirstText); 673 SqlParameter param20 = new SqlParameter("@profileFirstText", user.ProfileFirstText);
674 SqlParameter param21 = new SqlParameter("@profileImage", user.profileImage.ToString()); 674 SqlParameter param21 = new SqlParameter("@profileImage", user.ProfileImage.ToString());
675 SqlParameter param22 = new SqlParameter("@profileFirstImage", user.profileFirstImage.ToString()); 675 SqlParameter param22 = new SqlParameter("@profileFirstImage", user.ProfileFirstImage.ToString());
676 SqlParameter param23 = new SqlParameter("@keyUUUID", user.UUID.ToString()); 676 SqlParameter param23 = new SqlParameter("@keyUUUID", user.Id.ToString());
677 SqlParameter param24 = new SqlParameter("@webLoginKey", user.webLoginKey.UUID.ToString()); 677 SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.UUID.ToString());
678 command.Parameters.Add(param1); 678 command.Parameters.Add(param1);
679 command.Parameters.Add(param2); 679 command.Parameters.Add(param2);
680 command.Parameters.Add(param3); 680 command.Parameters.Add(param3);