Make SQLiteNG the default since it actually does work with Mono 2.4 on Linux.

I know this is tough on Mac OSX users (since SQLiteNG requires the export of the sqlite3_column_origin_name symbol and this isn't present for the Mac OSX sqlite3 system library)
Unfortunately, I need to shaft somebody (as it were)

2 files changed, 13 insertions, 9 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 59bce36..bbc6f78 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -112,11 +112,15 @@
     ;storage_plugin = "OpenSim.Data.Null.dll"
 
     ; --- To use sqlite as region storage:
-    ; 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
+    ;
+    ; PLEASE NOTE: Unfortunately, the SQLiteNG database plugin, while necessary to use sqlite with Mono on Linux, is 
+    ; not compatible with the sqlite3 library installed on Mac OSX.  If you're using Mono 2.4 you can still use the old sqlite
+    ; library by uncommenting the SQLite.dll storage plugin (and commenting out SQLiteNG).  Unfortunately, the older library
+    ; will not work with Mono 2.6 on Mac OSX so you will either need to replace the sqlite3 system library or use MySQL instead
+    ;
     ; 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_plugin = "OpenSim.Data.SQLiteNG.dll"
+    ;storage_plugin = "OpenSim.Data.SQLite.dll"
     storage_connection_string="URI=file:OpenSim.db,version=3";
 
     ; --- To use MySQL storage, supply your own connection string (this is only an example):
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 74bdbe2..58860d1 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -6,12 +6,12 @@
     ;
 
     ; SQLite
-    ; Uncomment this line if you want to use sqlite storage with Mono 2.4
-    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+    Include-Storage = "config-include/storage/SQLiteNGStandalone.ini";
 
-    ; 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";
+    ; Unfortunately SQLiteNG is not compatible with Mac OSX.  You can still use the older
+    ; sqlite library if you are using Mono 2.4.  Please see the notes in OpenSim.ini for sqlite
+    ; for more details
+    ;Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
     ; MySql  
     ; Uncomment these lines if you want to use mysql storage