From 04488d9d3819fd16502a095771d1513af02b7a93 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Fri, 15 Aug 2008 22:49:26 +0000 Subject: Plumb in the partner and the account title fields for profile info. --- OpenSim/Data/MySQL/MySQLManager.cs | 27 ++++++++++++++++++++++---- OpenSim/Data/MySQL/MySQLUserData.cs | 2 +- OpenSim/Data/MySQL/Resources/004_UserStore.sql | 6 ++++++ 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 OpenSim/Data/MySQL/Resources/004_UserStore.sql (limited to 'OpenSim/Data/MySQL') diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index d2b436c..58599a8 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs @@ -590,7 +590,21 @@ namespace OpenSim.Data.MySQL retval.UserFlags = Convert.ToInt32(reader["userFlags"].ToString()); retval.GodLevel = Convert.ToInt32(reader["godLevel"].ToString()); - + if (reader.IsDBNull(reader.GetOrdinal("customType"))) + retval.CustomType = ""; + else + retval.CustomType = reader["customType"].ToString(); + + if (reader.IsDBNull(reader.GetOrdinal("partner"))) + { + retval.Partner = LLUUID.Zero; + } + else + { + LLUUID tmp; + LLUUID.TryParse((string)reader["partner"], out tmp); + retval.Partner = tmp; + } } else { @@ -731,14 +745,14 @@ namespace OpenSim.Data.MySQL "`homeLocationX`, `homeLocationY`, `homeLocationZ`, `homeLookAtX`, `homeLookAtY`, `homeLookAtZ`, `created`, "; sql += "`lastLogin`, `userInventoryURI`, `userAssetURI`, `profileCanDoMask`, `profileWantDoMask`, `profileAboutText`, "; - sql += "`profileFirstText`, `profileImage`, `profileFirstImage`, `webLoginKey`, `userFlags`, `godLevel`) VALUES "; + sql += "`profileFirstText`, `profileImage`, `profileFirstImage`, `webLoginKey`, `userFlags`, `godLevel`, `customType`, `partner`) VALUES "; sql += "(?UUID, ?username, ?lastname, ?passwordHash, ?passwordSalt, ?homeRegion, "; sql += "?homeLocationX, ?homeLocationY, ?homeLocationZ, ?homeLookAtX, ?homeLookAtY, ?homeLookAtZ, ?created, "; sql += "?lastLogin, ?userInventoryURI, ?userAssetURI, ?profileCanDoMask, ?profileWantDoMask, ?profileAboutText, "; - sql += "?profileFirstText, ?profileImage, ?profileFirstImage, ?webLoginKey, ?userFlags, ?godLevel)"; + sql += "?profileFirstText, ?profileImage, ?profileFirstImage, ?webLoginKey, ?userFlags, ?godLevel, ?customType, ?partner)"; Dictionary parameters = new Dictionary(); parameters["?UUID"] = uuid.ToString(); @@ -766,6 +780,8 @@ namespace OpenSim.Data.MySQL parameters["?webLoginKey"] = string.Empty; parameters["?userFlags"] = "0"; parameters["?godLevel"] = "0"; + parameters["?customType"] = ""; + parameters["?partner"] = ""; bool returnval = false; @@ -821,7 +837,7 @@ namespace OpenSim.Data.MySQL float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin, string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask, string aboutText, string firstText, - LLUUID profileImage, LLUUID firstImage, LLUUID webLoginKey, int userFlags, int godLevel) + LLUUID profileImage, LLUUID firstImage, LLUUID webLoginKey, int userFlags, int godLevel, string customType, LLUUID partner) { string sql = "UPDATE users SET `username` = ?username , `lastname` = ?lastname "; sql += ", `passwordHash` = ?passwordHash , `passwordSalt` = ?passwordSalt , "; @@ -834,6 +850,7 @@ namespace OpenSim.Data.MySQL sql += "`profileAboutText` = ?profileAboutText , `profileFirstText` = ?profileFirstText, "; sql += "`profileImage` = ?profileImage , `profileFirstImage` = ?profileFirstImage , "; sql += "`userFlags` = ?userFlags , `godLevel` = ?godLevel , "; + sql += "`customType` = ?customType , `partner` = ?partner , "; sql += "`webLoginKey` = ?webLoginKey WHERE UUID = ?UUID"; Dictionary parameters = new Dictionary(); @@ -863,6 +880,8 @@ namespace OpenSim.Data.MySQL parameters["?webLoginKey"] = webLoginKey.ToString(); parameters["?userFlags"] = userFlags.ToString(); parameters["?godLevel"] = godLevel.ToString(); + parameters["?customType"] = customType.ToString(); + parameters["?partner"] = partner.ToString(); bool returnval = false; try diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index b7f4cbd..f77d947 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs @@ -685,7 +685,7 @@ namespace OpenSim.Data.MySQL user.HomeRegion, user.HomeRegionID, user.HomeLocation.X, user.HomeLocation.Y, user.HomeLocation.Z, user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin, user.UserInventoryURI, user.UserAssetURI, user.CanDoMask, user.WantDoMask, user.AboutText, - user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey, user.UserFlags, user.GodLevel); + user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey, user.UserFlags, user.GodLevel, user.CustomType, user.Partner); } return true; diff --git a/OpenSim/Data/MySQL/Resources/004_UserStore.sql b/OpenSim/Data/MySQL/Resources/004_UserStore.sql new file mode 100644 index 0000000..03142af --- /dev/null +++ b/OpenSim/Data/MySQL/Resources/004_UserStore.sql @@ -0,0 +1,6 @@ +BEGIN; + +ALTER TABLE users add customType varchar(32) not null default ''; +ALTER TABLE users add partner char(36) not null default '00000000-0000-0000-0000-000000000000'; + +COMMIT; -- cgit v1.1