Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes

This chiefly brings in the new sqlite adaptor and renames the old one to SQLiteLegacy
Existing configuratios should continue to work without changes unless you are using Mac OSX and mono 2.6 or later, in which case you will need to enable SQLiteLegacy instead.  Please se the instructions in OpenSim.ini.example and the relevant config/include .ini files

Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index b6d4a1c..7dcd323 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SQLite;
 using System.Reflection;
 using log4net;
+using Mono.Data.Sqlite;
 using OpenMetaverse;
 
 namespace OpenSim.Data.SQLite
@@ -66,7 +66,7 @@ namespace OpenSim.Data.SQLite
                     connectionString = "URI=file:GridServerSqlite.db;";
                 }
 
-                dbcon = new SQLiteConnection(connectionString);
+                dbcon = new SqliteConnection(connectionString);
 
                 dbcon.Open();
             }
@@ -93,11 +93,11 @@ namespace OpenSim.Data.SQLite
         /// <returns>A SQLite DB Command</returns>
         public IDbCommand Query(string sql, Dictionary<string, string> parameters)
         {
-            SQLiteCommand dbcommand = (SQLiteCommand) dbcon.CreateCommand();
+            SqliteCommand dbcommand = (SqliteCommand) dbcon.CreateCommand();
             dbcommand.CommandText = sql;
             foreach (KeyValuePair<string, string> param in parameters)
             {
-                SQLiteParameter paramx = new SQLiteParameter(param.Key, param.Value);
+                SqliteParameter paramx = new SqliteParameter(param.Key, param.Value);
                 dbcommand.Parameters.Add(paramx);
             }