From 411d06c94e0b8e696eb6b19019f46079927151f2 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 9 Jan 2008 18:41:20 +0000 Subject: [PATCH] moving Region store for SQLite into the OpenSim.Framework.Data.SQLite namespace to mirror what is done with MySQL. This will require a configuration change for people using SQLite for prims which is given as an example in OpenSim.ini.example --- .../Data.SQLite/SQLiteRegionData.cs} | 4 +-- bin/OpenSim.ini.example | 2 +- prebuild.xml | 29 +------------------ 3 files changed, 4 insertions(+), 31 deletions(-) rename OpenSim/{Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs => Framework/Data.SQLite/SQLiteRegionData.cs} (99%) diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs similarity index 99% rename from OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs rename to OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs index 4d11dfb723..00b0acb47f 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs @@ -38,9 +38,9 @@ using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.LandManagement; using OpenSim.Region.Environment.Scenes; -namespace OpenSim.DataStore.MonoSqlite +namespace OpenSim.Framework.Data.SQLite { - public class MonoSqliteDataStore : IRegionDataStore + public class SQLiteRegionData : IRegionDataStore { private const string primSelect = "select * from prims"; private const string shapeSelect = "select * from primshapes"; diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 08ce5cdd62..8cef459989 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -21,7 +21,7 @@ physics = basicphysics ; storage_plugin = "OpenSim.DataStore.NullStorage.dll" ; --- To use sqlite as region storage: -storage_plugin = "OpenSim.DataStore.MonoSqlite.dll" +storage_plugin = "OpenSim.Framework.Data.SQLite.dll" storage_connection_string="URI=file:OpenSim.db,version=3"; ; --- To use MySQL storage, supply your own connectionstring (this is only an example): diff --git a/prebuild.xml b/prebuild.xml index 9833ecc66a..bd154194cb 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -673,34 +673,6 @@ - - - - - ../../../../bin/ - - - - - ../../../../bin/ - - - - ../../../../bin/ - - - - - - - - - - - - - - @@ -969,6 +941,7 @@ +