aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/DB4o/DB4oManager.cs12
-rw-r--r--OpenSim/Data/MSSQL/MSSQLManager.cs14
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs26
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs22
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs16
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs36
6 files changed, 63 insertions, 63 deletions
diff --git a/OpenSim/Data/DB4o/DB4oManager.cs b/OpenSim/Data/DB4o/DB4oManager.cs
index 13bd61c..a9368d5 100644
--- a/OpenSim/Data/DB4o/DB4oManager.cs
+++ b/OpenSim/Data/DB4o/DB4oManager.cs
@@ -125,10 +125,10 @@ namespace OpenSim.Data.DB4o
125 IObjectSet result = database.Get(typeof (UserProfileData)); 125 IObjectSet result = database.Get(typeof (UserProfileData));
126 foreach (UserProfileData row in result) 126 foreach (UserProfileData row in result)
127 { 127 {
128 if (userProfiles.ContainsKey(row.Id)) 128 if (userProfiles.ContainsKey(row.ID))
129 userProfiles[row.Id] = row; 129 userProfiles[row.ID] = row;
130 else 130 else
131 userProfiles.Add(row.Id, row); 131 userProfiles.Add(row.ID, row);
132 } 132 }
133 database.Close(); 133 database.Close();
134 } 134 }
@@ -145,13 +145,13 @@ namespace OpenSim.Data.DB4o
145 /// <returns>true on success, false on fail to persist to db</returns> 145 /// <returns>true on success, false on fail to persist to db</returns>
146 public bool UpdateRecord(UserProfileData record) 146 public bool UpdateRecord(UserProfileData record)
147 { 147 {
148 if (userProfiles.ContainsKey(record.Id)) 148 if (userProfiles.ContainsKey(record.ID))
149 { 149 {
150 userProfiles[record.Id] = record; 150 userProfiles[record.ID] = record;
151 } 151 }
152 else 152 else
153 { 153 {
154 userProfiles.Add(record.Id, record); 154 userProfiles.Add(record.ID, record);
155 } 155 }
156 156
157 try 157 try
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index e33468a..e327c46 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -300,7 +300,7 @@ namespace OpenSim.Data.MSSQL
300 300
301 if (reader.Read()) 301 if (reader.Read())
302 { 302 {
303 retval.Id = new LLUUID((string)reader["UUID"]); 303 retval.ID = new LLUUID((string)reader["UUID"]);
304 retval.FirstName = (string)reader["username"]; 304 retval.FirstName = (string)reader["username"];
305 retval.SurName = (string)reader["lastname"]; 305 retval.SurName = (string)reader["lastname"];
306 306
@@ -323,14 +323,14 @@ namespace OpenSim.Data.MSSQL
323 retval.UserInventoryURI = (string)reader["userInventoryURI"]; 323 retval.UserInventoryURI = (string)reader["userInventoryURI"];
324 retval.UserAssetURI = (string)reader["userAssetURI"]; 324 retval.UserAssetURI = (string)reader["userAssetURI"];
325 325
326 retval.ProfileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString()); 326 retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
327 retval.ProfileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString()); 327 retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
328 328
329 retval.ProfileAboutText = (string)reader["profileAboutText"]; 329 retval.AboutText = (string)reader["profileAboutText"];
330 retval.ProfileFirstText = (string)reader["profileFirstText"]; 330 retval.FirstLifeAboutText = (string)reader["profileFirstText"];
331 331
332 retval.ProfileImage = new LLUUID((string)reader["profileImage"]); 332 retval.Image = new LLUUID((string)reader["profileImage"]);
333 retval.ProfileFirstImage = new LLUUID((string)reader["profileFirstImage"]); 333 retval.FirstLifeImage = new LLUUID((string)reader["profileFirstImage"]);
334 retval.WebLoginKey = new LLUUID((string)reader["webLoginKey"]); 334 retval.WebLoginKey = new LLUUID((string)reader["webLoginKey"]);
335 } 335 }
336 else 336 else
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index aae0095..3d4cabf 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.Id); 456 return GetAgentByUUID(profile.ID);
457 } 457 }
458 458
459 /// <summary> 459 /// <summary>
@@ -505,14 +505,14 @@ namespace OpenSim.Data.MSSQL
505 { 505 {
506 lock (database) 506 lock (database)
507 { 507 {
508 InsertUserRow(user.Id, user.FirstName, 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.CanDoMask, user.WantDoMask,
514 user.ProfileAboutText, user.ProfileFirstText, user.ProfileImage, 514 user.AboutText, user.FirstLifeAboutText, user.Image,
515 user.ProfileFirstImage, user.WebLoginKey); 515 user.FirstLifeImage, user.WebLoginKey);
516 } 516 }
517 } 517 }
518 catch (Exception e) 518 catch (Exception e)
@@ -651,7 +651,7 @@ 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.Id.ToString()); 654 SqlParameter param1 = new SqlParameter("@uuid", user.ID.ToString());
655 SqlParameter param2 = new SqlParameter("@username", user.FirstName); 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);
@@ -667,13 +667,13 @@ namespace OpenSim.Data.MSSQL
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.CanDoMask));
671 SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.ProfileWantDoMask)); 671 SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.WantDoMask));
672 SqlParameter param19 = new SqlParameter("@profileAboutText", user.ProfileAboutText); 672 SqlParameter param19 = new SqlParameter("@profileAboutText", user.AboutText);
673 SqlParameter param20 = new SqlParameter("@profileFirstText", user.ProfileFirstText); 673 SqlParameter param20 = new SqlParameter("@profileFirstText", user.FirstLifeAboutText);
674 SqlParameter param21 = new SqlParameter("@profileImage", user.ProfileImage.ToString()); 674 SqlParameter param21 = new SqlParameter("@profileImage", user.Image.ToString());
675 SqlParameter param22 = new SqlParameter("@profileFirstImage", user.ProfileFirstImage.ToString()); 675 SqlParameter param22 = new SqlParameter("@profileFirstImage", user.FirstLifeImage.ToString());
676 SqlParameter param23 = new SqlParameter("@keyUUUID", user.Id.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);
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
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