aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteUserData.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteUserData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs36
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index e395565..815c1bb 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Data.SQLite
135 if (rows.Length > 0) 135 if (rows.Length > 0)
136 { 136 {
137 UserProfileData user = buildUserProfile(rows[0]); 137 UserProfileData user = buildUserProfile(rows[0]);
138 DataRow row = ds.Tables["useragents"].Rows.Find(Util.ToRawUuidString(user.Id)); 138 DataRow row = ds.Tables["useragents"].Rows.Find(Util.ToRawUuidString(user.ID));
139 if (row != null) 139 if (row != null)
140 { 140 {
141 user.CurrentAgent = buildUserAgent(row); 141 user.CurrentAgent = buildUserAgent(row);
@@ -365,7 +365,7 @@ namespace OpenSim.Data.SQLite
365 DataTable users = ds.Tables["users"]; 365 DataTable users = ds.Tables["users"];
366 lock (ds) 366 lock (ds)
367 { 367 {
368 DataRow row = users.Rows.Find(Util.ToRawUuidString(user.Id)); 368 DataRow row = users.Rows.Find(Util.ToRawUuidString(user.ID));
369 if (row == null) 369 if (row == null)
370 { 370 {
371 row = users.NewRow(); 371 row = users.NewRow();
@@ -384,7 +384,7 @@ namespace OpenSim.Data.SQLite
384 if (user.CurrentAgent != null) 384 if (user.CurrentAgent != null)
385 { 385 {
386 DataTable ua = ds.Tables["useragents"]; 386 DataTable ua = ds.Tables["useragents"];
387 row = ua.Rows.Find(Util.ToRawUuidString(user.Id)); 387 row = ua.Rows.Find(Util.ToRawUuidString(user.ID));
388 if (row == null) 388 if (row == null)
389 { 389 {
390 row = ua.NewRow(); 390 row = ua.NewRow();
@@ -401,7 +401,7 @@ namespace OpenSim.Data.SQLite
401 // I just added this to help the standalone login situation. 401 // I just added this to help the standalone login situation.
402 //It still needs to be looked at by a Database guy 402 //It still needs to be looked at by a Database guy
403 DataTable ua = ds.Tables["useragents"]; 403 DataTable ua = ds.Tables["useragents"];
404 row = ua.Rows.Find(Util.ToRawUuidString(user.Id)); 404 row = ua.Rows.Find(Util.ToRawUuidString(user.ID));
405 405
406 if (row == null) 406 if (row == null)
407 { 407 {
@@ -593,7 +593,7 @@ namespace OpenSim.Data.SQLite
593 UserProfileData user = new UserProfileData(); 593 UserProfileData user = new UserProfileData();
594 LLUUID tmp; 594 LLUUID tmp;
595 LLUUID.TryParse((String)row["UUID"], out tmp); 595 LLUUID.TryParse((String)row["UUID"], out tmp);
596 user.Id = tmp; 596 user.ID = tmp;
597 user.FirstName = (String) row["username"]; 597 user.FirstName = (String) row["username"];
598 user.SurName = (String) row["surname"]; 598 user.SurName = (String) row["surname"];
599 user.PasswordHash = (String) row["passwordHash"]; 599 user.PasswordHash = (String) row["passwordHash"];
@@ -616,14 +616,14 @@ namespace OpenSim.Data.SQLite
616 user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]); 616 user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]);
617 user.UserInventoryURI = (String) row["userInventoryURI"]; 617 user.UserInventoryURI = (String) row["userInventoryURI"];
618 user.UserAssetURI = (String) row["userAssetURI"]; 618 user.UserAssetURI = (String) row["userAssetURI"];
619 user.ProfileCanDoMask = Convert.ToUInt32(row["profileCanDoMask"]); 619 user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]);
620 user.ProfileWantDoMask = Convert.ToUInt32(row["profileWantDoMask"]); 620 user.WantDoMask = Convert.ToUInt32(row["profileWantDoMask"]);
621 user.ProfileAboutText = (String) row["profileAboutText"]; 621 user.AboutText = (String) row["profileAboutText"];
622 user.ProfileFirstText = (String) row["profileFirstText"]; 622 user.FirstLifeAboutText = (String) row["profileFirstText"];
623 LLUUID.TryParse((String)row["profileImage"], out tmp); 623 LLUUID.TryParse((String)row["profileImage"], out tmp);
624 user.ProfileImage = tmp; 624 user.Image = tmp;
625 LLUUID.TryParse((String)row["profileFirstImage"], out tmp); 625 LLUUID.TryParse((String)row["profileFirstImage"], out tmp);
626 user.ProfileFirstImage = tmp; 626 user.FirstLifeImage = tmp;
627 user.WebLoginKey = new LLUUID((String) row["webLoginKey"]); 627 user.WebLoginKey = new LLUUID((String) row["webLoginKey"]);
628 628
629 return user; 629 return user;
@@ -631,7 +631,7 @@ namespace OpenSim.Data.SQLite
631 631
632 private void fillUserRow(DataRow row, UserProfileData user) 632 private void fillUserRow(DataRow row, UserProfileData user)
633 { 633 {
634 row["UUID"] = Util.ToRawUuidString(user.Id); 634 row["UUID"] = Util.ToRawUuidString(user.ID);
635 row["username"] = user.FirstName; 635 row["username"] = user.FirstName;
636 row["surname"] = user.SurName; 636 row["surname"] = user.SurName;
637 row["passwordHash"] = user.PasswordHash; 637 row["passwordHash"] = user.PasswordHash;
@@ -652,12 +652,12 @@ namespace OpenSim.Data.SQLite
652 row["rootInventoryFolderID"] = user.RootInventoryFolderID; 652 row["rootInventoryFolderID"] = user.RootInventoryFolderID;
653 row["userInventoryURI"] = user.UserInventoryURI; 653 row["userInventoryURI"] = user.UserInventoryURI;
654 row["userAssetURI"] = user.UserAssetURI; 654 row["userAssetURI"] = user.UserAssetURI;
655 row["profileCanDoMask"] = user.ProfileCanDoMask; 655 row["profileCanDoMask"] = user.CanDoMask;
656 row["profileWantDoMask"] = user.ProfileWantDoMask; 656 row["profileWantDoMask"] = user.WantDoMask;
657 row["profileAboutText"] = user.ProfileAboutText; 657 row["profileAboutText"] = user.AboutText;
658 row["profileFirstText"] = user.ProfileFirstText; 658 row["profileFirstText"] = user.FirstLifeAboutText;
659 row["profileImage"] = user.ProfileImage; 659 row["profileImage"] = user.Image;
660 row["profileFirstImage"] = user.ProfileFirstImage; 660 row["profileFirstImage"] = user.FirstLifeImage;
661 row["webLoginKey"] = user.WebLoginKey; 661 row["webLoginKey"] = user.WebLoginKey;
662 662
663 // ADO.NET doesn't handle NULL very well 663 // ADO.NET doesn't handle NULL very well