ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Thanks to Mic Bowman for inspiring me to look at that we are still using ASCIIEncoder in places we shouldn't.

Browse Source
This commit is contained in:
Adam Frisby
2008-05-01 18:50:44 +00:00
parent 239228abd8
commit 76d8eaa406
13 changed files with 10 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/SQLite/SQLiteGridData.cs
View File

@@ -224,7 +224,7 @@ namespace OpenSim.Data.SQLite
public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
{
SHA512Managed HashProvider = new SHA512Managed();
ASCIIEncoding TextProvider = new ASCIIEncoding();
Encoding TextProvider = new UTF8Encoding();
byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
byte[] hash = HashProvider.ComputeHash(stream);

16
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@@ -1223,22 +1223,6 @@ namespace OpenSim.Data.SQLite
s.TextureEntry = textureEntry;
s.ExtraParams = (byte[]) row["ExtraParams"];
// System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
// string texture = encoding.GetString((Byte[])row["Texture"]);
// if (!texture.StartsWith("<"))
// {
// //here so that we can still work with old format database files (ie from before I added xml serialization)
// LLObject.TextureEntry textureEntry = null;
// textureEntry = new LLObject.TextureEntry(new LLUUID(texture));
// s.TextureEntry = textureEntry.ToBytes();
// }
// else
// {
// TextureBlock textureEntry = TextureBlock.FromXmlString(texture);
// s.TextureEntry = textureEntry.TextureData;
// s.ExtraParams = textureEntry.ExtraParams;
// }
return s;
}