7 files changed, 26 insertions, 9 deletions

diff --git a/bin/Mono.Data.Sqlite.dll b/bin/Mono.Data.Sqlite.dll
new file mode 100644
index 0000000..2b81a44
--- /dev/null
+++ b/bin/Mono.Data.Sqlite.dll
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index fd81b39..9a1cccd 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -112,9 +112,11 @@
     ;storage_plugin = "OpenSim.Data.Null.dll"
 
     ; --- To use sqlite as region storage:
-    ; NOTE: SQLite and OpenSim are not functioning properly with Mono 2.4.3 or greater.
-    ; If you are using Mono you probably should be using MySQL
+    ; PLEASE NOTE: If you use want to use SQLite with Mono 2.6 and above, you must use the SQLiteNG plugin rather than the existing SQLite one
+    ; do this by commenting out the OpenSim.Data.SQLite.dll line below and uncommenting the OpenSim.Data.SQLiteNG.dll one
+    ; You will also need to do the same thing in config-include/StandaloneCommon.ini if you are running in standalone mode
     storage_plugin = "OpenSim.Data.SQLite.dll"
+    ; storage_plugin = "OpenSim.Data.SQLiteNG.dll"
     storage_connection_string="URI=file:OpenSim.db,version=3";
 
     ; --- To use MySQL storage, supply your own connection string (this is only an example):
@@ -1237,11 +1239,6 @@
 ;; These defaults allow OpenSim to work out of the box with
 ;; zero configuration
 ;;
-[DatabaseService]
-    ;; default standalone, overridable in StandaloneCommon.ini
-    StorageProvider = "OpenSim.Data.SQLite.dll"
-
-
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/Robust.HG.ini.example
index 5e3f9a7..5e3f9a7 100644
--- a/bin/OpenSim.Server.HG.ini.example
+++ b/bin/Robust.HG.ini.example
diff --git a/bin/OpenSim.Server.exe.config b/bin/Robust.exe.config
index c2d93c0..c2d93c0 100644
--- a/bin/OpenSim.Server.exe.config
+++ b/bin/Robust.exe.config
diff --git a/bin/OpenSim.Server.ini.example b/bin/Robust.ini.example
index 9bedac6..9bedac6 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/Robust.ini.example
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f89c67a..74bdbe2 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -6,10 +6,14 @@
     ;
 
     ; SQLite
-    ; Uncomment this line if you want to use sqlite storage
+    ; Uncomment this line if you want to use sqlite storage with Mono 2.4
     Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
-    ; For MySql.  
+    ; If you want to use sqlite with Mono 2.6 and above, uncomment this line instead.
+    ; Don't forget to do the same thing for the storage_plugin setting in OpenSim.ini
+    ; Include-Storage = "config-include/storage/SQLiteNGStandalone.ini";
+
+    ; MySql  
     ; Uncomment these lines if you want to use mysql storage 
     ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
diff --git a/bin/config-include/storage/SQLiteNGStandalone.ini b/bin/config-include/storage/SQLiteNGStandalone.ini
new file mode 100644
index 0000000..ba00aca
--- /dev/null
+++ b/bin/config-include/storage/SQLiteNGStandalone.ini
@@ -0,0 +1,16 @@
+; These are the initialization settings for running OpenSim Standalone with an SQLite database
+
+[DatabaseService]
+    StorageProvider = "OpenSim.Data.SQLiteNG.dll"
+
+[AvatarService]
+    ConnectionString = "URI=file:avatars.db,version=3"
+
+[AuthenticationService]
+    ConnectionString = "URI=file:auth.db,version=3"
+
+[UserAccountService]
+    ConnectionString = "URI=file:userprofiles.db,version=3"
+
+[FriendsService]
+    ConnectionString = "URI=file:friends.db,version=3"