diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserData.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index a1e1094..0acf47b 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Data.MySQL | |||
59 | { | 59 | { |
60 | // TODO: actually do something with our connect string | 60 | // TODO: actually do something with our connect string |
61 | // instead of loading the second config | 61 | // instead of loading the second config |
62 | 62 | ||
63 | IniFile iniFile = new IniFile("mysql_connection.ini"); | 63 | IniFile iniFile = new IniFile("mysql_connection.ini"); |
64 | string settingHostname = iniFile.ParseFileReadValue("hostname"); | 64 | string settingHostname = iniFile.ParseFileReadValue("hostname"); |
65 | string settingDatabase = iniFile.ParseFileReadValue("database"); | 65 | string settingDatabase = iniFile.ParseFileReadValue("database"); |
@@ -67,7 +67,7 @@ namespace OpenSim.Data.MySQL | |||
67 | string settingPassword = iniFile.ParseFileReadValue("password"); | 67 | string settingPassword = iniFile.ParseFileReadValue("password"); |
68 | string settingPooling = iniFile.ParseFileReadValue("pooling"); | 68 | string settingPooling = iniFile.ParseFileReadValue("pooling"); |
69 | string settingPort = iniFile.ParseFileReadValue("port"); | 69 | string settingPort = iniFile.ParseFileReadValue("port"); |
70 | 70 | ||
71 | m_usersTableName = iniFile.ParseFileReadValue("userstablename"); | 71 | m_usersTableName = iniFile.ParseFileReadValue("userstablename"); |
72 | if (m_usersTableName == null) | 72 | if (m_usersTableName == null) |
73 | { | 73 | { |
@@ -206,15 +206,15 @@ namespace OpenSim.Data.MySQL | |||
206 | param["?friendID"] = friend.UUID.ToString(); | 206 | param["?friendID"] = friend.UUID.ToString(); |
207 | param["?friendPerms"] = perms.ToString(); | 207 | param["?friendPerms"] = perms.ToString(); |
208 | param["?datetimestamp"] = dtvalue.ToString(); | 208 | param["?datetimestamp"] = dtvalue.ToString(); |
209 | 209 | ||
210 | try | 210 | try |
211 | { | 211 | { |
212 | lock (database) | 212 | lock (database) |
213 | { | 213 | { |
214 | IDbCommand adder = | 214 | IDbCommand adder = |
215 | database.Query( | 215 | database.Query( |
216 | "INSERT INTO `" + m_userFriendsTableName + "` " + | 216 | "INSERT INTO `" + m_userFriendsTableName + "` " + |
217 | "(`ownerID`,`friendID`,`friendPerms`,`datetimestamp`) " + | 217 | "(`ownerID`,`friendID`,`friendPerms`,`datetimestamp`) " + |
218 | "VALUES " + | 218 | "VALUES " + |
219 | "(?ownerID,?friendID,?friendPerms,?datetimestamp)", | 219 | "(?ownerID,?friendID,?friendPerms,?datetimestamp)", |
220 | param); | 220 | param); |
@@ -325,7 +325,7 @@ namespace OpenSim.Data.MySQL | |||
325 | 325 | ||
326 | // This is not a real column in the database table, it's a joined column from the opposite record | 326 | // This is not a real column in the database table, it's a joined column from the opposite record |
327 | fli.FriendListOwnerPerms = (uint)Convert.ToInt32(reader["ownerperms"]); | 327 | fli.FriendListOwnerPerms = (uint)Convert.ToInt32(reader["ownerperms"]); |
328 | 328 | ||
329 | Lfli.Add(fli); | 329 | Lfli.Add(fli); |
330 | } | 330 | } |
331 | reader.Close(); | 331 | reader.Close(); |
@@ -599,7 +599,7 @@ namespace OpenSim.Data.MySQL | |||
599 | user.UserAssetURI, user.CanDoMask, user.WantDoMask, user.AboutText, | 599 | user.UserAssetURI, user.CanDoMask, user.WantDoMask, user.AboutText, |
600 | user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey); | 600 | user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey); |
601 | } | 601 | } |
602 | 602 | ||
603 | return true; | 603 | return true; |
604 | } | 604 | } |
605 | 605 | ||
@@ -630,7 +630,7 @@ namespace OpenSim.Data.MySQL | |||
630 | 630 | ||
631 | /// Appearance | 631 | /// Appearance |
632 | /// TODO: stubs for now to get us to a compiling state gently | 632 | /// TODO: stubs for now to get us to a compiling state gently |
633 | // override public AvatarAppearance GetUserAppearance(LLUUID user) | 633 | // override public AvatarAppearance GetUserAppearance(LLUUID user) |
634 | // { | 634 | // { |
635 | // return new AvatarAppearance(); | 635 | // return new AvatarAppearance(); |
636 | // } | 636 | // } |
@@ -644,12 +644,12 @@ namespace OpenSim.Data.MySQL | |||
644 | { | 644 | { |
645 | return; | 645 | return; |
646 | } | 646 | } |
647 | 647 | ||
648 | override public void RemoveAttachment(LLUUID user, LLUUID item) | 648 | override public void RemoveAttachment(LLUUID user, LLUUID item) |
649 | { | 649 | { |
650 | return; | 650 | return; |
651 | } | 651 | } |
652 | 652 | ||
653 | override public List<LLUUID> GetAttachments(LLUUID user) | 653 | override public List<LLUUID> GetAttachments(LLUUID user) |
654 | { | 654 | { |
655 | return new List<LLUUID>(); | 655 | return new List<LLUUID>(); |