4 files changed, 3 insertions, 19 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 3330732..cf81bee 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -417,7 +417,7 @@ namespace OpenSim.Data.MSSQL
         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);
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index df52ae0..e830133 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -366,7 +366,7 @@ namespace OpenSim.Data.MySQL
         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);
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index f07b98f..989ec77 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -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);
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 9908735..b648ee8 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -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;
         }