aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-07 18:46:27 +0000
committerJustin Clarke Casey2009-01-07 18:46:27 +0000
commit8d035b196df31ddb41e4917a757e83acdbb03d78 (patch)
tree777605603b47b20075b13fd56317667b29b36185 /OpenSim
parent* refactor: Remove MakeHttpRequest wrapper method from Scene in favour of a d... (diff)
downloadopensim-SC_OLD-8d035b196df31ddb41e4917a757e83acdbb03d78.zip
opensim-SC_OLD-8d035b196df31ddb41e4917a757e83acdbb03d78.tar.gz
opensim-SC_OLD-8d035b196df31ddb41e4917a757e83acdbb03d78.tar.bz2
opensim-SC_OLD-8d035b196df31ddb41e4917a757e83acdbb03d78.tar.xz
* Apply http://opensimulator.org/mantis/view.php?id=2948
* This fixes adding and updating user profiles in MySQL on platforms that have a commas as a decimal separator * Thanks Tommil!
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/MySQLGridData.cs12
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs74
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs24
3 files changed, 55 insertions, 55 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index da01ad3..437747b 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -245,7 +245,7 @@ namespace OpenSim.Data.MySQL
245 245
246 try 246 try
247 { 247 {
248 Dictionary<string, string> param = new Dictionary<string, string>(); 248 Dictionary<string, object> param = new Dictionary<string, object>();
249 param["?xmin"] = xmin.ToString(); 249 param["?xmin"] = xmin.ToString();
250 param["?ymin"] = ymin.ToString(); 250 param["?ymin"] = ymin.ToString();
251 param["?xmax"] = xmax.ToString(); 251 param["?xmax"] = xmax.ToString();
@@ -294,7 +294,7 @@ namespace OpenSim.Data.MySQL
294 294
295 try 295 try
296 { 296 {
297 Dictionary<string, string> param = new Dictionary<string, string>(); 297 Dictionary<string, object> param = new Dictionary<string, object>();
298 param["?name"] = namePrefix + "%"; 298 param["?name"] = namePrefix + "%";
299 299
300 IDbCommand result = 300 IDbCommand result =
@@ -339,7 +339,7 @@ namespace OpenSim.Data.MySQL
339 339
340 try 340 try
341 { 341 {
342 Dictionary<string, string> param = new Dictionary<string, string>(); 342 Dictionary<string, object> param = new Dictionary<string, object>();
343 param["?handle"] = handle.ToString(); 343 param["?handle"] = handle.ToString();
344 344
345 IDbCommand result = dbm.Manager.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param); 345 IDbCommand result = dbm.Manager.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
@@ -374,7 +374,7 @@ namespace OpenSim.Data.MySQL
374 374
375 try 375 try
376 { 376 {
377 Dictionary<string, string> param = new Dictionary<string, string>(); 377 Dictionary<string, object> param = new Dictionary<string, object>();
378 param["?uuid"] = uuid.ToString(); 378 param["?uuid"] = uuid.ToString();
379 379
380 IDbCommand result = dbm.Manager.Query("SELECT * FROM regions WHERE uuid = ?uuid", param); 380 IDbCommand result = dbm.Manager.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
@@ -409,7 +409,7 @@ namespace OpenSim.Data.MySQL
409 409
410 try 410 try
411 { 411 {
412 Dictionary<string, string> param = new Dictionary<string, string>(); 412 Dictionary<string, object> param = new Dictionary<string, object>();
413 // Add % because this is a like query. 413 // Add % because this is a like query.
414 param["?regionName"] = regionName + "%"; 414 param["?regionName"] = regionName + "%";
415 // Order by statement will return shorter matches first. Only returns one record or no record. 415 // Order by statement will return shorter matches first. Only returns one record or no record.
@@ -546,7 +546,7 @@ namespace OpenSim.Data.MySQL
546 546
547 try 547 try
548 { 548 {
549 Dictionary<string, string> param = new Dictionary<string, string>(); 549 Dictionary<string, object> param = new Dictionary<string, object>();
550 param["?x"] = x.ToString(); 550 param["?x"] = x.ToString();
551 param["?y"] = y.ToString(); 551 param["?y"] = y.ToString();
552 IDbCommand result = 552 IDbCommand result =
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index a54c020..f16795e 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -340,7 +340,7 @@ namespace OpenSim.Data.MySQL
340 /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param> 340 /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>
341 /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param> 341 /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param>
342 /// <returns>A MySQL DB Command</returns> 342 /// <returns>A MySQL DB Command</returns>
343 public IDbCommand Query(string sql, Dictionary<string, string> parameters) 343 public IDbCommand Query(string sql, Dictionary<string, object> parameters)
344 { 344 {
345 try 345 try
346 { 346 {
@@ -348,7 +348,7 @@ namespace OpenSim.Data.MySQL
348 348
349 MySqlCommand dbcommand = (MySqlCommand) dbcon.CreateCommand(); 349 MySqlCommand dbcommand = (MySqlCommand) dbcon.CreateCommand();
350 dbcommand.CommandText = sql; 350 dbcommand.CommandText = sql;
351 foreach (KeyValuePair<string, string> param in parameters) 351 foreach (KeyValuePair<string, object> param in parameters)
352 { 352 {
353 dbcommand.Parameters.AddWithValue(param.Key, param.Value); 353 dbcommand.Parameters.AddWithValue(param.Key, param.Value);
354 } 354 }
@@ -714,7 +714,7 @@ namespace OpenSim.Data.MySQL
714 string sql = "INSERT INTO logs (`target`, `server`, `method`, `arguments`, `priority`, `message`) VALUES "; 714 string sql = "INSERT INTO logs (`target`, `server`, `method`, `arguments`, `priority`, `message`) VALUES ";
715 sql += "(?target, ?server, ?method, ?arguments, ?priority, ?message)"; 715 sql += "(?target, ?server, ?method, ?arguments, ?priority, ?message)";
716 716
717 Dictionary<string, string> parameters = new Dictionary<string, string>(); 717 Dictionary<string, object> parameters = new Dictionary<string, object>();
718 parameters["?server"] = serverDaemon; 718 parameters["?server"] = serverDaemon;
719 parameters["?target"] = target; 719 parameters["?target"] = target;
720 parameters["?method"] = methodCall; 720 parameters["?method"] = methodCall;
@@ -793,34 +793,34 @@ namespace OpenSim.Data.MySQL
793 "?lastLogin, ?userInventoryURI, ?userAssetURI, ?profileCanDoMask, ?profileWantDoMask, ?profileAboutText, "; 793 "?lastLogin, ?userInventoryURI, ?userAssetURI, ?profileCanDoMask, ?profileWantDoMask, ?profileAboutText, ";
794 sql += "?profileFirstText, ?profileImage, ?profileFirstImage, ?webLoginKey, ?userFlags, ?godLevel, ?customType, ?partner)"; 794 sql += "?profileFirstText, ?profileImage, ?profileFirstImage, ?webLoginKey, ?userFlags, ?godLevel, ?customType, ?partner)";
795 795
796 Dictionary<string, string> parameters = new Dictionary<string, string>(); 796 Dictionary<string, object> parameters = new Dictionary<string, object>();
797 parameters["?UUID"] = uuid.ToString(); 797 parameters["?UUID"] = uuid.ToString();
798 parameters["?username"] = username; 798 parameters["?username"] = username;
799 parameters["?lastname"] = lastname; 799 parameters["?lastname"] = lastname;
800 parameters["?email"] = email; 800 parameters["?email"] = email;
801 parameters["?passwordHash"] = passwordHash; 801 parameters["?passwordHash"] = passwordHash;
802 parameters["?passwordSalt"] = passwordSalt; 802 parameters["?passwordSalt"] = passwordSalt;
803 parameters["?homeRegion"] = homeRegion.ToString(); 803 parameters["?homeRegion"] = homeRegion;
804 parameters["?homeRegionID"] = homeRegionID.ToString(); 804 parameters["?homeRegionID"] = homeRegionID.ToString();
805 parameters["?homeLocationX"] = homeLocX.ToString(); 805 parameters["?homeLocationX"] = homeLocX;
806 parameters["?homeLocationY"] = homeLocY.ToString(); 806 parameters["?homeLocationY"] = homeLocY;
807 parameters["?homeLocationZ"] = homeLocZ.ToString(); 807 parameters["?homeLocationZ"] = homeLocZ;
808 parameters["?homeLookAtX"] = homeLookAtX.ToString(); 808 parameters["?homeLookAtX"] = homeLookAtX;
809 parameters["?homeLookAtY"] = homeLookAtY.ToString(); 809 parameters["?homeLookAtY"] = homeLookAtY;
810 parameters["?homeLookAtZ"] = homeLookAtZ.ToString(); 810 parameters["?homeLookAtZ"] = homeLookAtZ;
811 parameters["?created"] = created.ToString(); 811 parameters["?created"] = created;
812 parameters["?lastLogin"] = lastlogin.ToString(); 812 parameters["?lastLogin"] = lastlogin;
813 parameters["?userInventoryURI"] = inventoryURI; 813 parameters["?userInventoryURI"] = inventoryURI;
814 parameters["?userAssetURI"] = assetURI; 814 parameters["?userAssetURI"] = assetURI;
815 parameters["?profileCanDoMask"] = canDoMask.ToString(); 815 parameters["?profileCanDoMask"] = canDoMask;
816 parameters["?profileWantDoMask"] = wantDoMask.ToString(); 816 parameters["?profileWantDoMask"] = wantDoMask;
817 parameters["?profileAboutText"] = aboutText; 817 parameters["?profileAboutText"] = aboutText;
818 parameters["?profileFirstText"] = firstText; 818 parameters["?profileFirstText"] = firstText;
819 parameters["?profileImage"] = profileImage.ToString(); 819 parameters["?profileImage"] = profileImage.ToString();
820 parameters["?profileFirstImage"] = firstImage.ToString(); 820 parameters["?profileFirstImage"] = firstImage.ToString();
821 parameters["?webLoginKey"] = webLoginKey.ToString(); 821 parameters["?webLoginKey"] = webLoginKey.ToString();
822 parameters["?userFlags"] = userFlags.ToString(); 822 parameters["?userFlags"] = userFlags;
823 parameters["?godLevel"] = godLevel.ToString(); 823 parameters["?godLevel"] = godLevel;
824 parameters["?customType"] = customType == null ? "" : customType; 824 parameters["?customType"] = customType == null ? "" : customType;
825 parameters["?partner"] = partner.ToString(); 825 parameters["?partner"] = partner.ToString();
826 bool returnval = false; 826 bool returnval = false;
@@ -892,35 +892,35 @@ namespace OpenSim.Data.MySQL
892 sql += "`customType` = ?customType , `partner` = ?partner , "; 892 sql += "`customType` = ?customType , `partner` = ?partner , ";
893 sql += "`webLoginKey` = ?webLoginKey WHERE UUID = ?UUID"; 893 sql += "`webLoginKey` = ?webLoginKey WHERE UUID = ?UUID";
894 894
895 Dictionary<string, string> parameters = new Dictionary<string, string>(); 895 Dictionary<string, object> parameters = new Dictionary<string, object>();
896 parameters["?UUID"] = uuid.ToString(); 896 parameters["?UUID"] = uuid.ToString();
897 parameters["?username"] = username; 897 parameters["?username"] = username;
898 parameters["?lastname"] = lastname; 898 parameters["?lastname"] = lastname;
899 parameters["?email"] = email; 899 parameters["?email"] = email;
900 parameters["?passwordHash"] = passwordHash; 900 parameters["?passwordHash"] = passwordHash;
901 parameters["?passwordSalt"] = passwordSalt; 901 parameters["?passwordSalt"] = passwordSalt;
902 parameters["?homeRegion"] = homeRegion.ToString(); 902 parameters["?homeRegion"] = homeRegion;
903 parameters["?homeRegionID"] = homeRegionID.ToString(); 903 parameters["?homeRegionID"] = homeRegionID.ToString();
904 parameters["?homeLocationX"] = homeLocX.ToString(); 904 parameters["?homeLocationX"] = homeLocX;
905 parameters["?homeLocationY"] = homeLocY.ToString(); 905 parameters["?homeLocationY"] = homeLocY;
906 parameters["?homeLocationZ"] = homeLocZ.ToString(); 906 parameters["?homeLocationZ"] = homeLocZ;
907 parameters["?homeLookAtX"] = homeLookAtX.ToString(); 907 parameters["?homeLookAtX"] = homeLookAtX;
908 parameters["?homeLookAtY"] = homeLookAtY.ToString(); 908 parameters["?homeLookAtY"] = homeLookAtY;
909 parameters["?homeLookAtZ"] = homeLookAtZ.ToString(); 909 parameters["?homeLookAtZ"] = homeLookAtZ;
910 parameters["?created"] = created.ToString(); 910 parameters["?created"] = created;
911 parameters["?lastLogin"] = lastlogin.ToString(); 911 parameters["?lastLogin"] = lastlogin;
912 parameters["?userInventoryURI"] = inventoryURI; 912 parameters["?userInventoryURI"] = inventoryURI;
913 parameters["?userAssetURI"] = assetURI; 913 parameters["?userAssetURI"] = assetURI;
914 parameters["?profileCanDoMask"] = canDoMask.ToString(); 914 parameters["?profileCanDoMask"] = canDoMask;
915 parameters["?profileWantDoMask"] = wantDoMask.ToString(); 915 parameters["?profileWantDoMask"] = wantDoMask;
916 parameters["?profileAboutText"] = aboutText; 916 parameters["?profileAboutText"] = aboutText;
917 parameters["?profileFirstText"] = firstText; 917 parameters["?profileFirstText"] = firstText;
918 parameters["?profileImage"] = profileImage.ToString(); 918 parameters["?profileImage"] = profileImage.ToString();
919 parameters["?profileFirstImage"] = firstImage.ToString(); 919 parameters["?profileFirstImage"] = firstImage.ToString();
920 parameters["?webLoginKey"] = webLoginKey.ToString(); 920 parameters["?webLoginKey"] = webLoginKey.ToString();
921 parameters["?userFlags"] = userFlags.ToString(); 921 parameters["?userFlags"] = userFlags;
922 parameters["?godLevel"] = godLevel.ToString(); 922 parameters["?godLevel"] = godLevel;
923 parameters["?customType"] = customType == null ? "" : customType.ToString(); 923 parameters["?customType"] = customType == null ? "" : customType;
924 parameters["?partner"] = partner.ToString(); 924 parameters["?partner"] = partner.ToString();
925 925
926 bool returnval = false; 926 bool returnval = false;
@@ -993,7 +993,7 @@ namespace OpenSim.Data.MySQL
993 sql += ";"; 993 sql += ";";
994 } 994 }
995 995
996 Dictionary<string, string> parameters = new Dictionary<string, string>(); 996 Dictionary<string, object> parameters = new Dictionary<string, object>();
997 997
998 parameters["?regionHandle"] = regiondata.regionHandle.ToString(); 998 parameters["?regionHandle"] = regiondata.regionHandle.ToString();
999 parameters["?regionName"] = regiondata.regionName.ToString(); 999 parameters["?regionName"] = regiondata.regionName.ToString();
@@ -1063,7 +1063,7 @@ namespace OpenSim.Data.MySQL
1063 1063
1064 string sql = "DELETE FROM regions WHERE uuid = ?uuid;"; 1064 string sql = "DELETE FROM regions WHERE uuid = ?uuid;";
1065 1065
1066 Dictionary<string, string> parameters = new Dictionary<string, string>(); 1066 Dictionary<string, object> parameters = new Dictionary<string, object>();
1067 1067
1068 try 1068 try
1069 { 1069 {
@@ -1102,7 +1102,7 @@ namespace OpenSim.Data.MySQL
1102 sql += "REPLACE INTO "; 1102 sql += "REPLACE INTO ";
1103 sql += "agents (UUID, sessionID, secureSessionID, agentIP, agentPort, agentOnline, loginTime, logoutTime, currentRegion, currentHandle, currentPos, currentLookAt) VALUES "; 1103 sql += "agents (UUID, sessionID, secureSessionID, agentIP, agentPort, agentOnline, loginTime, logoutTime, currentRegion, currentHandle, currentPos, currentLookAt) VALUES ";
1104 sql += "(?UUID, ?sessionID, ?secureSessionID, ?agentIP, ?agentPort, ?agentOnline, ?loginTime, ?logoutTime, ?currentRegion, ?currentHandle, ?currentPos, ?currentLookAt);"; 1104 sql += "(?UUID, ?sessionID, ?secureSessionID, ?agentIP, ?agentPort, ?agentOnline, ?loginTime, ?logoutTime, ?currentRegion, ?currentHandle, ?currentPos, ?currentLookAt);";
1105 Dictionary<string, string> parameters = new Dictionary<string, string>(); 1105 Dictionary<string, object> parameters = new Dictionary<string, object>();
1106 1106
1107 parameters["?UUID"] = agentdata.ProfileID.ToString(); 1107 parameters["?UUID"] = agentdata.ProfileID.ToString();
1108 parameters["?sessionID"] = agentdata.SessionID.ToString(); 1108 parameters["?sessionID"] = agentdata.SessionID.ToString();
@@ -1114,8 +1114,8 @@ namespace OpenSim.Data.MySQL
1114 parameters["?logoutTime"] = agentdata.LogoutTime.ToString(); 1114 parameters["?logoutTime"] = agentdata.LogoutTime.ToString();
1115 parameters["?currentRegion"] = agentdata.Region.ToString(); 1115 parameters["?currentRegion"] = agentdata.Region.ToString();
1116 parameters["?currentHandle"] = agentdata.Handle.ToString(); 1116 parameters["?currentHandle"] = agentdata.Handle.ToString();
1117 parameters["?currentPos"] = "<" + (agentdata.Position.X).ToString() + "," + (agentdata.Position.Y).ToString() + "," + (agentdata.Position.Z).ToString() + ">"; 1117 parameters["?currentPos"] = "<" + (agentdata.Position.X).ToString().Replace(",", ".") + "," + (agentdata.Position.Y).ToString().Replace(",", ".") + "," + (agentdata.Position.Z).ToString().Replace(",", ".") + ">";
1118 parameters["?currentLookAt"] = "<" + (agentdata.LookAt.X).ToString() + "," + (agentdata.LookAt.Y).ToString() + "," + (agentdata.LookAt.Z).ToString() + ">"; 1118 parameters["?currentLookAt"] = "<" + (agentdata.LookAt.X).ToString().Replace(",", ".") + "," + (agentdata.LookAt.Y).ToString().Replace(",", ".") + "," + (agentdata.LookAt.Z).ToString().Replace(",", ".") + ">";
1119 1119
1120 bool returnval = false; 1120 bool returnval = false;
1121 1121
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 14d178b..f6a9af3 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Data.MySQL
176 176
177 try 177 try
178 { 178 {
179 Dictionary<string, string> param = new Dictionary<string, string>(); 179 Dictionary<string, object> param = new Dictionary<string, object>();
180 param["?first"] = user; 180 param["?first"] = user;
181 param["?second"] = last; 181 param["?second"] = last;
182 182
@@ -209,7 +209,7 @@ namespace OpenSim.Data.MySQL
209 { 209 {
210 int dtvalue = Util.UnixTimeSinceEpoch(); 210 int dtvalue = Util.UnixTimeSinceEpoch();
211 211
212 Dictionary<string, string> param = new Dictionary<string, string>(); 212 Dictionary<string, object> param = new Dictionary<string, object>();
213 param["?ownerID"] = friendlistowner.ToString(); 213 param["?ownerID"] = friendlistowner.ToString();
214 param["?friendID"] = friend.ToString(); 214 param["?friendID"] = friend.ToString();
215 param["?friendPerms"] = perms.ToString(); 215 param["?friendPerms"] = perms.ToString();
@@ -251,7 +251,7 @@ namespace OpenSim.Data.MySQL
251 251
252 public override void RemoveUserFriend(UUID friendlistowner, UUID friend) 252 public override void RemoveUserFriend(UUID friendlistowner, UUID friend)
253 { 253 {
254 Dictionary<string, string> param = new Dictionary<string, string>(); 254 Dictionary<string, object> param = new Dictionary<string, object>();
255 param["?ownerID"] = friendlistowner.ToString(); 255 param["?ownerID"] = friendlistowner.ToString();
256 param["?friendID"] = friend.ToString(); 256 param["?friendID"] = friend.ToString();
257 257
@@ -285,7 +285,7 @@ namespace OpenSim.Data.MySQL
285 285
286 public override void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms) 286 public override void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
287 { 287 {
288 Dictionary<string, string> param = new Dictionary<string, string>(); 288 Dictionary<string, object> param = new Dictionary<string, object>();
289 param["?ownerID"] = friendlistowner.ToString(); 289 param["?ownerID"] = friendlistowner.ToString();
290 param["?friendID"] = friend.ToString(); 290 param["?friendID"] = friend.ToString();
291 param["?friendPerms"] = perms.ToString(); 291 param["?friendPerms"] = perms.ToString();
@@ -318,7 +318,7 @@ namespace OpenSim.Data.MySQL
318 { 318 {
319 List<FriendListItem> Lfli = new List<FriendListItem>(); 319 List<FriendListItem> Lfli = new List<FriendListItem>();
320 320
321 Dictionary<string, string> param = new Dictionary<string, string>(); 321 Dictionary<string, object> param = new Dictionary<string, object>();
322 param["?ownerID"] = friendlistowner.ToString(); 322 param["?ownerID"] = friendlistowner.ToString();
323 323
324 MySQLSuperManager dbm = GetLockedConnection("GetUserFriendList"); 324 MySQLSuperManager dbm = GetLockedConnection("GetUserFriendList");
@@ -373,7 +373,7 @@ namespace OpenSim.Data.MySQL
373 { 373 {
374 foreach (UUID uuid in uuids) 374 foreach (UUID uuid in uuids)
375 { 375 {
376 Dictionary<string, string> param = new Dictionary<string, string>(); 376 Dictionary<string, object> param = new Dictionary<string, object>();
377 param["?uuid"] = uuid.ToString(); 377 param["?uuid"] = uuid.ToString();
378 IDbCommand result = 378 IDbCommand result =
379 dbm.Manager.Query("select agentOnline,currentHandle from " + m_agentsTableName + 379 dbm.Manager.Query("select agentOnline,currentHandle from " + m_agentsTableName +
@@ -419,7 +419,7 @@ namespace OpenSim.Data.MySQL
419 querysplit = query.Split(' '); 419 querysplit = query.Split(' ');
420 if (querysplit.Length > 1 && querysplit[1].Trim() != String.Empty) 420 if (querysplit.Length > 1 && querysplit[1].Trim() != String.Empty)
421 { 421 {
422 Dictionary<string, string> param = new Dictionary<string, string>(); 422 Dictionary<string, object> param = new Dictionary<string, object>();
423 param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%"; 423 param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%";
424 param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], String.Empty) + "%"; 424 param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], String.Empty) + "%";
425 MySQLSuperManager dbm = GetLockedConnection("GeneratePickerResults"); 425 MySQLSuperManager dbm = GetLockedConnection("GeneratePickerResults");
@@ -461,7 +461,7 @@ namespace OpenSim.Data.MySQL
461 461
462 try 462 try
463 { 463 {
464 Dictionary<string, string> param = new Dictionary<string, string>(); 464 Dictionary<string, object> param = new Dictionary<string, object>();
465 param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%"; 465 param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%";
466 466
467 IDbCommand result = 467 IDbCommand result =
@@ -506,7 +506,7 @@ namespace OpenSim.Data.MySQL
506 MySQLSuperManager dbm = GetLockedConnection("GetUserByUUID"); 506 MySQLSuperManager dbm = GetLockedConnection("GetUserByUUID");
507 try 507 try
508 { 508 {
509 Dictionary<string, string> param = new Dictionary<string, string>(); 509 Dictionary<string, object> param = new Dictionary<string, object>();
510 param["?uuid"] = uuid.ToString(); 510 param["?uuid"] = uuid.ToString();
511 511
512 IDbCommand result = dbm.Manager.Query("SELECT * FROM " + m_usersTableName + " WHERE UUID = ?uuid", param); 512 IDbCommand result = dbm.Manager.Query("SELECT * FROM " + m_usersTableName + " WHERE UUID = ?uuid", param);
@@ -596,7 +596,7 @@ namespace OpenSim.Data.MySQL
596 596
597 try 597 try
598 { 598 {
599 Dictionary<string, string> param = new Dictionary<string, string>(); 599 Dictionary<string, object> param = new Dictionary<string, object>();
600 param["?uuid"] = uuid.ToString(); 600 param["?uuid"] = uuid.ToString();
601 601
602 IDbCommand result = dbm.Manager.Query("SELECT * FROM " + m_agentsTableName + " WHERE UUID = ?uuid", 602 IDbCommand result = dbm.Manager.Query("SELECT * FROM " + m_agentsTableName + " WHERE UUID = ?uuid",
@@ -744,7 +744,7 @@ namespace OpenSim.Data.MySQL
744 MySQLSuperManager dbm = GetLockedConnection("GetUserAppearance"); 744 MySQLSuperManager dbm = GetLockedConnection("GetUserAppearance");
745 try 745 try
746 { 746 {
747 Dictionary<string, string> param = new Dictionary<string, string>(); 747 Dictionary<string, object> param = new Dictionary<string, object>();
748 param["?owner"] = user.ToString(); 748 param["?owner"] = user.ToString();
749 749
750 IDbCommand result = dbm.Manager.Query( 750 IDbCommand result = dbm.Manager.Query(
@@ -825,7 +825,7 @@ namespace OpenSim.Data.MySQL
825 825
826 public Hashtable GetUserAttachments(UUID agentID) 826 public Hashtable GetUserAttachments(UUID agentID)
827 { 827 {
828 Dictionary<string, string> param = new Dictionary<string, string>(); 828 Dictionary<string, object> param = new Dictionary<string, object>();
829 param["?uuid"] = agentID.ToString(); 829 param["?uuid"] = agentID.ToString();
830 830
831 MySQLSuperManager dbm = GetLockedConnection("GetUserAttachments"); 831 MySQLSuperManager dbm = GetLockedConnection("GetUserAttachments");