diff options
| author | Justin Clarke Casey | 2007-12-20 22:56:30 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2007-12-20 22:56:30 +0000 |
| commit | e2fa5efb5950a2d536286797d94ce945ecbdcc9f (patch) | |
| tree | c769cd81bd9688d772c0ca13bdd7c477cb45e7e2 /OpenSim/Framework | |
| parent | Convert an sqlite user LLUUID I'd missed (diff) | |
| download | opensim-SC_OLD-e2fa5efb5950a2d536286797d94ce945ecbdcc9f.zip opensim-SC_OLD-e2fa5efb5950a2d536286797d94ce945ecbdcc9f.tar.gz opensim-SC_OLD-e2fa5efb5950a2d536286797d94ce945ecbdcc9f.tar.bz2 opensim-SC_OLD-e2fa5efb5950a2d536286797d94ce945ecbdcc9f.tar.xz | |
Revert a couple of UUIDs back to hyphenated since we actually sometimes store as hyphenated, sometimes not...
Diffstat (limited to 'OpenSim/Framework')
| -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 bb16a3e..dddc085 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"] = Util.ToRawUuidString(uuid); | 122 | param["uuid"] = uuid.ToString(); |
| 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(Util.ToRawUuidString(uuid) + ":" + handle.ToString() + ":" + challenge); | 193 | byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); |
| 194 | byte[] hash = HashProvider.ComputeHash(stream); | 194 | byte[] hash = HashProvider.ComputeHash(stream); |
| 195 | 195 | ||
| 196 | return false; | 196 | return false; |