diff options
author | Justin Clarke Casey | 2007-12-20 19:13:34 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2007-12-20 19:13:34 +0000 |
commit | f1ebe79824aa82fa30af35d07bf6720e719cd741 (patch) | |
tree | 18f43d04bdf2547dd66274a96f22c85171fc892a /OpenSim/Framework/Data.SQLite/SQLiteGridData.cs | |
parent | Establish Util.ToRawUuidString to get LLUUIDs in unhyphenated form (diff) | |
download | opensim-SC_OLD-f1ebe79824aa82fa30af35d07bf6720e719cd741.zip opensim-SC_OLD-f1ebe79824aa82fa30af35d07bf6720e719cd741.tar.gz opensim-SC_OLD-f1ebe79824aa82fa30af35d07bf6720e719cd741.tar.bz2 opensim-SC_OLD-f1ebe79824aa82fa30af35d07bf6720e719cd741.tar.xz |
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.
Diffstat (limited to 'OpenSim/Framework/Data.SQLite/SQLiteGridData.cs')
-rw-r--r-- | OpenSim/Framework/Data.SQLite/SQLiteGridData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
119 | public RegionProfileData GetProfileByLLUUID(LLUUID uuid) | 119 | public RegionProfileData GetProfileByLLUUID(LLUUID uuid) |
120 | { | 120 | { |
121 | Dictionary<string, string> param = new Dictionary<string, string>(); | 121 | Dictionary<string, string> param = new Dictionary<string, string>(); |
122 | param["uuid"] = uuid.ToString(); | 122 | param["uuid"] = Util.ToRawUuidString(uuid); |
123 | 123 | ||
124 | IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); | 124 | IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); |
125 | IDataReader reader = result.ExecuteReader(); | 125 | IDataReader reader = result.ExecuteReader(); |
@@ -190,7 +190,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
190 | SHA512Managed HashProvider = new SHA512Managed(); | 190 | SHA512Managed HashProvider = new SHA512Managed(); |
191 | ASCIIEncoding TextProvider = new ASCIIEncoding(); | 191 | ASCIIEncoding TextProvider = new ASCIIEncoding(); |
192 | 192 | ||
193 | byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); | 193 | byte[] stream = TextProvider.GetBytes(Util.ToRawUuidString(uuid) + ":" + handle.ToString() + ":" + challenge); |
194 | byte[] hash = HashProvider.ComputeHash(stream); | 194 | byte[] hash = HashProvider.ComputeHash(stream); |
195 | 195 | ||
196 | return false; | 196 | return false; |