aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL
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/MSSQL
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/MSSQL')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLManager.cs14
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs26
2 files changed, 20 insertions, 20 deletions
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);