3 files changed, 14 insertions, 17 deletions

diff --git a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
index f811825..9de5edb 100644
--- a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
 using System.Reflection;

-using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

-

 // General Information about an assembly is controlled through the following 

 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

diff --git a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
index 800e26c..511c5f0 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
@@ -27,8 +27,10 @@
 */

 using System;

 using System.Collections.Generic;

+using System.Data;

+using System.Security.Cryptography;

 using System.Text;

-using OpenSim.Framework.Data;

+using libsecondlife;

 

 namespace OpenSim.Framework.Data.SQLite

 {

@@ -99,8 +101,8 @@ namespace OpenSim.Framework.Data.SQLite
             Dictionary<string, string> param = new Dictionary<string, string>();

             param["handle"] = handle.ToString();

 

-            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);

-            System.Data.IDataReader reader = result.ExecuteReader();

+            IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);

+            IDataReader reader = result.ExecuteReader();

 

             SimProfileData row = database.getRow(reader);

             reader.Close();

@@ -114,13 +116,13 @@ namespace OpenSim.Framework.Data.SQLite
         /// </summary>

         /// <param name="uuid">The region UUID</param>

         /// <returns>The sim profile</returns>

-        public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid)

+        public SimProfileData GetProfileByLLUUID(LLUUID uuid)

         {

             Dictionary<string, string> param = new Dictionary<string, string>();

             param["uuid"] = uuid.ToStringHyphenated();

 

-            System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);

-            System.Data.IDataReader reader = result.ExecuteReader();

+            IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);

+            IDataReader reader = result.ExecuteReader();

 

             SimProfileData row = database.getRow(reader);

             reader.Close();

@@ -153,7 +155,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// <param name="handle">The attempted regionHandle of the challenger</param>

         /// <param name="authkey">The secret</param>

         /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>

-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey)

+        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)

         {

             bool throwHissyFit = false; // Should be true by 1.0

 

@@ -174,10 +176,10 @@ namespace OpenSim.Framework.Data.SQLite
         /// <param name="authhash"></param>

         /// <param name="challenge"></param>

         /// <returns></returns>

-        public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge)

+        public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)

         {

-            System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed();

-            System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding();

+            SHA512Managed HashProvider = new SHA512Managed();

+            ASCIIEncoding TextProvider = new ASCIIEncoding();

 

             byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);

             byte[] hash = HashProvider.ComputeHash(stream);

diff --git a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
index 3397e0d..c9931ab 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
@@ -27,12 +27,9 @@
 */

 using System;

 using System.Collections.Generic;

-using System.Text;

 using System.Data;

-

 using System.Data.SQLite;

-

-using OpenSim.Framework.Data;

+using libsecondlife;

 

 namespace OpenSim.Framework.Data.SQLite

 {

@@ -105,7 +102,7 @@ namespace OpenSim.Framework.Data.SQLite
                 // Region Main

                 retval.regionHandle = (ulong)reader["regionHandle"];

                 retval.regionName = (string)reader["regionName"];

-                retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]);

+                retval.UUID = new LLUUID((string)reader["uuid"]);

 

                 // Secrets

                 retval.regionRecvKey = (string)reader["regionRecvKey"];