aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorSean Dague2008-04-10 14:09:30 +0000
committerSean Dague2008-04-10 14:09:30 +0000
commit25fea01b92a7682e10f57ce979217d31fee975ef (patch)
tree0e0dec2344cd06609bf47f1a7e2245a0a94f99c6 /OpenSim/Data/MySQL
parentmoved fields to properties for UserDataProfile, which was (diff)
downloadopensim-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 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs22
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs16
2 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index 110f192..f4ef172 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -431,7 +431,7 @@ namespace OpenSim.Data.MySQL
431 if (!LLUUID.TryParse((string)reader["UUID"], out id)) 431 if (!LLUUID.TryParse((string)reader["UUID"], out id))
432 return null; 432 return null;
433 433
434 retval.Id = id; 434 retval.ID = id;
435 retval.FirstName = (string) reader["username"]; 435 retval.FirstName = (string) reader["username"];
436 retval.SurName = (string) reader["lastname"]; 436 retval.SurName = (string) reader["lastname"];
437 437
@@ -454,33 +454,33 @@ namespace OpenSim.Data.MySQL
454 retval.UserInventoryURI = (string) reader["userInventoryURI"]; 454 retval.UserInventoryURI = (string) reader["userInventoryURI"];
455 retval.UserAssetURI = (string) reader["userAssetURI"]; 455 retval.UserAssetURI = (string) reader["userAssetURI"];
456 456
457 retval.ProfileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString()); 457 retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
458 retval.ProfileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString()); 458 retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
459 459
460 if (reader.IsDBNull(reader.GetOrdinal("profileAboutText"))) 460 if (reader.IsDBNull(reader.GetOrdinal("profileAboutText")))
461 retval.ProfileAboutText = ""; 461 retval.AboutText = "";
462 else 462 else
463 retval.ProfileAboutText = (string) reader["profileAboutText"]; 463 retval.AboutText = (string) reader["profileAboutText"];
464 464
465 if (reader.IsDBNull(reader.GetOrdinal("profileFirstText"))) 465 if (reader.IsDBNull(reader.GetOrdinal("profileFirstText")))
466 retval.ProfileFirstText = ""; 466 retval.FirstLifeAboutText = "";
467 else 467 else
468 retval.ProfileFirstText = (string)reader["profileFirstText"]; 468 retval.FirstLifeAboutText = (string)reader["profileFirstText"];
469 469
470 if (reader.IsDBNull(reader.GetOrdinal("profileImage"))) 470 if (reader.IsDBNull(reader.GetOrdinal("profileImage")))
471 retval.ProfileImage = LLUUID.Zero; 471 retval.Image = LLUUID.Zero;
472 else { 472 else {
473 LLUUID tmp; 473 LLUUID tmp;
474 LLUUID.TryParse((string)reader["profileImage"], out tmp); 474 LLUUID.TryParse((string)reader["profileImage"], out tmp);
475 retval.ProfileImage = tmp; 475 retval.Image = tmp;
476 } 476 }
477 477
478 if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage"))) 478 if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage")))
479 retval.ProfileFirstImage = LLUUID.Zero; 479 retval.FirstLifeImage = LLUUID.Zero;
480 else { 480 else {
481 LLUUID tmp; 481 LLUUID tmp;
482 LLUUID.TryParse((string)reader["profileFirstImage"], out tmp); 482 LLUUID.TryParse((string)reader["profileFirstImage"], out tmp);
483 retval.ProfileFirstImage = tmp; 483 retval.FirstLifeImage = tmp;
484 } 484 }
485 485
486 if(reader.IsDBNull(reader.GetOrdinal("webLoginKey"))) 486 if(reader.IsDBNull(reader.GetOrdinal("webLoginKey")))
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 5654207..5b2dc76 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -475,7 +475,7 @@ namespace OpenSim.Data.MySQL
475 override public UserAgentData GetAgentByName(string user, string last) 475 override public UserAgentData GetAgentByName(string user, string last)
476 { 476 {
477 UserProfileData profile = GetUserByName(user, last); 477 UserProfileData profile = GetUserByName(user, last);
478 return GetAgentByUUID(profile.Id); 478 return GetAgentByUUID(profile.ID);
479 } 479 }
480 480
481 override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) 481 override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
@@ -547,14 +547,14 @@ namespace OpenSim.Data.MySQL
547 { 547 {
548 lock (database) 548 lock (database)
549 { 549 {
550 database.insertUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt, 550 database.insertUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
551 user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, 551 user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y,
552 user.HomeLocation.Z, 552 user.HomeLocation.Z,
553 user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, 553 user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
554 user.LastLogin, user.UserInventoryURI, user.UserAssetURI, 554 user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
555 user.ProfileCanDoMask, user.ProfileWantDoMask, 555 user.CanDoMask, user.WantDoMask,
556 user.ProfileAboutText, user.ProfileFirstText, user.ProfileImage, 556 user.AboutText, user.FirstLifeAboutText, user.Image,
557 user.ProfileFirstImage, user.WebLoginKey); 557 user.FirstLifeImage, user.WebLoginKey);
558 } 558 }
559 } 559 }
560 catch (Exception e) 560 catch (Exception e)
@@ -590,11 +590,11 @@ namespace OpenSim.Data.MySQL
590 /// <param name="user">The profile data to use to update the DB</param> 590 /// <param name="user">The profile data to use to update the DB</param>
591 override public bool UpdateUserProfile(UserProfileData user) 591 override public bool UpdateUserProfile(UserProfileData user)
592 { 592 {
593 database.updateUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt, 593 database.updateUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
594 user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, user.HomeLocation.Z, user.HomeLookAt.X, 594 user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, user.HomeLocation.Z, user.HomeLookAt.X,
595 user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin, user.UserInventoryURI, 595 user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin, user.UserInventoryURI,
596 user.UserAssetURI, user.ProfileCanDoMask, user.ProfileWantDoMask, user.ProfileAboutText, 596 user.UserAssetURI, user.CanDoMask, user.WantDoMask, user.AboutText,
597 user.ProfileFirstText, user.ProfileImage, user.ProfileFirstImage, user.WebLoginKey); 597 user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey);
598 return true; 598 return true;
599 } 599 }
600 600