aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
diff options
context:
space:
mode:
authorJeff Ames2007-12-20 05:43:02 +0000
committerJeff Ames2007-12-20 05:43:02 +0000
commitbe2ad79e52efb5eb543057e8e73fa601d0b91c87 (patch)
tree688a11b5737835b3cd46b2beaf01c6e9d23ace09 /OpenSim/Framework/Data.MySQL/MySQLGridData.cs
parent*Added event called after any movement is handled (OnClientMovement) - will b... (diff)
downloadopensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.zip
opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.gz
opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.bz2
opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.xz
Added patch from Johan. First attempt to solve the LibSL.Packet GC problem. Works with LibSL rev>1532
Diffstat (limited to 'OpenSim/Framework/Data.MySQL/MySQLGridData.cs')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLGridData.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index ac3d849..7843562 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Framework.Data.MySQL
304 lock (database) 304 lock (database)
305 { 305 {
306 Dictionary<string, string> param = new Dictionary<string, string>(); 306 Dictionary<string, string> param = new Dictionary<string, string>();
307 param["?uuid"] = uuid.ToStringHyphenated(); 307 param["?uuid"] = uuid.ToString();
308 308
309 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param); 309 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
310 IDataReader reader = result.ExecuteReader(); 310 IDataReader reader = result.ExecuteReader();
@@ -377,7 +377,7 @@ namespace OpenSim.Framework.Data.MySQL
377 SHA512Managed HashProvider = new SHA512Managed(); 377 SHA512Managed HashProvider = new SHA512Managed();
378 ASCIIEncoding TextProvider = new ASCIIEncoding(); 378 ASCIIEncoding TextProvider = new ASCIIEncoding();
379 379
380 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); 380 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
381 byte[] hash = HashProvider.ComputeHash(stream); 381 byte[] hash = HashProvider.ComputeHash(stream);
382 382
383 return false; 383 return false;