From f1ebe79824aa82fa30af35d07bf6720e719cd741 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 20 Dec 2007 19:13:34 +0000 Subject: Fix up other sqlite db interactions to use non-hyphenated uuid Inventory contents retrieval and persistent region storage standalone now appear to work as well as they did before :) This patch will not fix grid problems. May be bugs present due to conversions I didn't spot. I personally probably don't have any more time for this today. I'm also not entirely convinced this is the right way forward so this might be a handy pause for thought. I'll also be delighted if I wake up tommorrow and everything is fine again. --- OpenSim/Framework/Data.SQLite/SQLiteGridData.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Framework/Data.SQLite/SQLiteGridData.cs') diff --git a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs index dddc085..bb16a3e 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs @@ -119,7 +119,7 @@ namespace OpenSim.Framework.Data.SQLite public RegionProfileData GetProfileByLLUUID(LLUUID uuid) { Dictionary param = new Dictionary(); - param["uuid"] = uuid.ToString(); + param["uuid"] = Util.ToRawUuidString(uuid); IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); IDataReader reader = result.ExecuteReader(); @@ -190,7 +190,7 @@ namespace OpenSim.Framework.Data.SQLite SHA512Managed HashProvider = new SHA512Managed(); ASCIIEncoding TextProvider = new ASCIIEncoding(); - byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); + byte[] stream = TextProvider.GetBytes(Util.ToRawUuidString(uuid) + ":" + handle.ToString() + ":" + challenge); byte[] hash = HashProvider.ComputeHash(stream); return false; -- cgit v1.1