aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs (renamed from OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs)4
-rw-r--r--bin/OpenSim.ini.example2
-rw-r--r--prebuild.xml29
3 files changed, 4 insertions, 31 deletions
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
index 4d11dfb..00b0acb 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;
38using OpenSim.Region.Environment.LandManagement; 38using OpenSim.Region.Environment.LandManagement;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Environment.Scenes;
40 40
41namespace OpenSim.DataStore.MonoSqlite 41namespace OpenSim.Framework.Data.SQLite
42{ 42{
43 public class MonoSqliteDataStore : IRegionDataStore 43 public class SQLiteRegionData : IRegionDataStore
44 { 44 {
45 private const string primSelect = "select * from prims"; 45 private const string primSelect = "select * from prims";
46 private const string shapeSelect = "select * from primshapes"; 46 private const string shapeSelect = "select * from primshapes";
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 08ce5cd..8cef459 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -21,7 +21,7 @@ physics = basicphysics
21; storage_plugin = "OpenSim.DataStore.NullStorage.dll" 21; storage_plugin = "OpenSim.DataStore.NullStorage.dll"
22 22
23; --- To use sqlite as region storage: 23; --- To use sqlite as region storage:
24storage_plugin = "OpenSim.DataStore.MonoSqlite.dll" 24storage_plugin = "OpenSim.Framework.Data.SQLite.dll"
25storage_connection_string="URI=file:OpenSim.db,version=3"; 25storage_connection_string="URI=file:OpenSim.db,version=3";
26 26
27; --- To use MySQL storage, supply your own connectionstring (this is only an example): 27; --- To use MySQL storage, supply your own connectionstring (this is only an example):
diff --git a/prebuild.xml b/prebuild.xml
index 9833ecc..bd15419 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -673,34 +673,6 @@
673 </Files> 673 </Files>
674 </Project> 674 </Project>
675 675
676
677 <Project name="OpenSim.DataStore.MonoSqlite" path="OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite" type="Library">
678 <Configuration name="Debug">
679 <Options>
680 <OutputPath>../../../../bin/</OutputPath>
681 </Options>
682 </Configuration>
683 <Configuration name="Release">
684 <Options>
685 <OutputPath>../../../../bin/</OutputPath>
686 </Options>
687 </Configuration>
688
689 <ReferencePath>../../../../bin/</ReferencePath>
690 <Reference name="System" localCopy="false"/>
691 <Reference name="System.Xml"/>
692 <Reference name="System.Data"/>
693 <Reference name="Mono.Data.SqliteClient"/>
694 <Reference name="libsecondlife.dll"/>
695 <Reference name="OpenSim.Framework"/>
696 <Reference name="OpenSim.Region.Environment"/>
697 <Reference name="OpenSim.Framework.Console"/>
698 <Files>
699 <Match pattern="*.cs" recurse="true"/>
700 </Files>
701 </Project>
702
703
704 <Project name="OpenSim.DataStore.MSSQL" path="OpenSim/Region/Storage/OpenSim.DataStore.MSSQL" type="Library"> 676 <Project name="OpenSim.DataStore.MSSQL" path="OpenSim/Region/Storage/OpenSim.DataStore.MSSQL" type="Library">
705 <Configuration name="Debug"> 677 <Configuration name="Debug">
706 <Options> 678 <Options>
@@ -969,6 +941,7 @@
969 <Reference name="OpenSim.Framework.Data"/> 941 <Reference name="OpenSim.Framework.Data"/>
970 <Reference name="OpenSim.Framework"/> 942 <Reference name="OpenSim.Framework"/>
971 <Reference name="OpenSim.Framework.Console"/> 943 <Reference name="OpenSim.Framework.Console"/>
944 <Reference name="OpenSim.Region.Environment"/>
972 <Reference name="libsecondlife.dll"/> 945 <Reference name="libsecondlife.dll"/>
973 <Reference name="Mono.Data.SqliteClient"/> 946 <Reference name="Mono.Data.SqliteClient"/>
974 <Files> 947 <Files>