aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.MySQL/MySQLManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Data.MySQL/MySQLManager.cs')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 9532f21..223d902 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -446,6 +446,7 @@ namespace OpenSim.Framework.Data.MySQL
446 446
447 retval.profileImage = new LLUUID((string) reader["profileImage"]); 447 retval.profileImage = new LLUUID((string) reader["profileImage"]);
448 retval.profileFirstImage = new LLUUID((string) reader["profileFirstImage"]); 448 retval.profileFirstImage = new LLUUID((string) reader["profileFirstImage"]);
449 retval.webLoginKey = new LLUUID((string)reader["webLoginKey"]);
449 } 450 }
450 else 451 else
451 { 452 {
@@ -531,7 +532,7 @@ namespace OpenSim.Framework.Data.MySQL
531 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin, 532 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
532 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask, 533 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
533 string aboutText, string firstText, 534 string aboutText, string firstText,
534 LLUUID profileImage, LLUUID firstImage) 535 LLUUID profileImage, LLUUID firstImage, LLUUID webLoginKey)
535 { 536 {
536 string sql = 537 string sql =
537 "INSERT INTO users (`UUID`, `username`, `lastname`, `passwordHash`, `passwordSalt`, `homeRegion`, "; 538 "INSERT INTO users (`UUID`, `username`, `lastname`, `passwordHash`, `passwordSalt`, `homeRegion`, ";
@@ -539,14 +540,14 @@ namespace OpenSim.Framework.Data.MySQL
539 "`homeLocationX`, `homeLocationY`, `homeLocationZ`, `homeLookAtX`, `homeLookAtY`, `homeLookAtZ`, `created`, "; 540 "`homeLocationX`, `homeLocationY`, `homeLocationZ`, `homeLookAtX`, `homeLookAtY`, `homeLookAtZ`, `created`, ";
540 sql += 541 sql +=
541 "`lastLogin`, `userInventoryURI`, `userAssetURI`, `profileCanDoMask`, `profileWantDoMask`, `profileAboutText`, "; 542 "`lastLogin`, `userInventoryURI`, `userAssetURI`, `profileCanDoMask`, `profileWantDoMask`, `profileAboutText`, ";
542 sql += "`profileFirstText`, `profileImage`, `profileFirstImage`) VALUES "; 543 sql += "`profileFirstText`, `profileImage`, `profileFirstImage`, `webLoginKey`) VALUES ";
543 544
544 sql += "(?UUID, ?username, ?lastname, ?passwordHash, ?passwordSalt, ?homeRegion, "; 545 sql += "(?UUID, ?username, ?lastname, ?passwordHash, ?passwordSalt, ?homeRegion, ";
545 sql += 546 sql +=
546 "?homeLocationX, ?homeLocationY, ?homeLocationZ, ?homeLookAtX, ?homeLookAtY, ?homeLookAtZ, ?created, "; 547 "?homeLocationX, ?homeLocationY, ?homeLocationZ, ?homeLookAtX, ?homeLookAtY, ?homeLookAtZ, ?created, ";
547 sql += 548 sql +=
548 "?lastLogin, ?userInventoryURI, ?userAssetURI, ?profileCanDoMask, ?profileWantDoMask, ?profileAboutText, "; 549 "?lastLogin, ?userInventoryURI, ?userAssetURI, ?profileCanDoMask, ?profileWantDoMask, ?profileAboutText, ";
549 sql += "?profileFirstText, ?profileImage, ?profileFirstImage)"; 550 sql += "?profileFirstText, ?profileImage, ?profileFirstImage, ?webLoginKey)";
550 551
551 Dictionary<string, string> parameters = new Dictionary<string, string>(); 552 Dictionary<string, string> parameters = new Dictionary<string, string>();
552 parameters["?UUID"] = uuid.ToString(); 553 parameters["?UUID"] = uuid.ToString();
@@ -571,6 +572,7 @@ namespace OpenSim.Framework.Data.MySQL
571 parameters["?profileFirstText"] = ""; 572 parameters["?profileFirstText"] = "";
572 parameters["?profileImage"] = LLUUID.Zero.ToString(); 573 parameters["?profileImage"] = LLUUID.Zero.ToString();
573 parameters["?profileFirstImage"] = LLUUID.Zero.ToString(); 574 parameters["?profileFirstImage"] = LLUUID.Zero.ToString();
575 parameters["?webLoginKey"] = LLUUID.Random().ToString();
574 576
575 bool returnval = false; 577 bool returnval = false;
576 578