diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs index 1111d7ddce..f9e56e01dc 100644 --- a/OpenSim/Data/SQLite/SQLiteFramework.cs +++ b/OpenSim/Data/SQLite/SQLiteFramework.cs @@ -44,7 +44,7 @@ namespace OpenSim.Data.SQLite /// public class SQLiteFramework { - protected Object m_lockObject = new Object(); + protected object m_lockObject = new Object(); protected SQLiteFramework(string connectionString) { @@ -60,13 +60,6 @@ namespace OpenSim.Data.SQLite { lock (connection) { -/* - SqliteConnection newConnection = - (SqliteConnection)((ICloneable)connection).Clone(); - newConnection.Open(); - - cmd.Connection = newConnection; -*/ cmd.Connection = connection; //Console.WriteLine("XXX " + cmd.CommandText); diff --git a/OpenSim/Region/OptionalModules/UserStatistics/ActiveConnectionsAJAX.cs b/OpenSim/Region/OptionalModules/UserStatistics/ActiveConnectionsAJAX.cs index 6a1112ce41..c9a18b4e9f 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/ActiveConnectionsAJAX.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/ActiveConnectionsAJAX.cs @@ -30,7 +30,6 @@ using System.Collections; using System.Collections.Generic; using System.Reflection; using System.Text; -using Mono.Data.SqliteClient; using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Framework; diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs index d3b97b1622..23f9c1e149 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs @@ -29,7 +29,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Text; -using Mono.Data.SqliteClient; +using Mono.Data.Sqlite; using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Region.Framework.Scenes; diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs index fcc7cee746..0042416e70 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs @@ -30,7 +30,7 @@ using System.Collections; using System.Collections.Generic; using System.Reflection; using System.Text; -using Mono.Data.SqliteClient; +using Mono.Data.Sqlite; using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Region.Framework.Scenes; diff --git a/OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs b/OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs index 3e0f45e51e..e848867fb4 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs @@ -31,7 +31,7 @@ using System.Collections.Generic; using System.Reflection; using System.Text; using System.Text.RegularExpressions; -using Mono.Data.SqliteClient; +using Mono.Data.Sqlite; using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Region.Framework.Scenes; diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs index 8d5434f169..bbc1c0ae08 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs @@ -29,7 +29,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Text; -using Mono.Data.SqliteClient; +using Mono.Data.Sqlite; using OpenMetaverse; using OpenSim.Framework; diff --git a/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs index 513686d92f..ad075b5dfd 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs @@ -30,7 +30,7 @@ using System.Collections; using System.Collections.Generic; using System.Reflection; using System.Text; -using Mono.Data.SqliteClient; +using Mono.Data.Sqlite; using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Region.Framework.Scenes; diff --git a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs index 3c92c6574a..004a3a27aa 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs @@ -42,7 +42,7 @@ using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -using Mono.Data.SqliteClient; +using Mono.Data.Sqlite; using Mono.Addins; using Caps = OpenSim.Framework.Capabilities.Caps; diff --git a/bin/Mono.Data.SqliteClient.dll b/bin/Mono.Data.SqliteClient.dll deleted file mode 100755 index 657fbf47b7..0000000000 Binary files a/bin/Mono.Data.SqliteClient.dll and /dev/null differ diff --git a/bin/Mono.Data.SqliteClient.dll.config b/bin/Mono.Data.SqliteClient.dll.config deleted file mode 100644 index 7db63ea150..0000000000 --- a/bin/Mono.Data.SqliteClient.dll.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/prebuild.xml b/prebuild.xml index 63a5bdf610..b708da3d2b 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -1382,7 +1382,7 @@ - +