diff options
author | Justin Clark-Casey (justincc) | 2010-04-30 17:45:00 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-04-30 17:45:00 +0100 |
commit | cc67de5b86ebcebadbe2ea46872a0dc63d99cae7 (patch) | |
tree | 1607da4eee9e63fe45e0abcf05da37ae5e239d70 /bin | |
parent | Make SQLiteNG the default since it actually does work with Mono 2.4 on Linux. (diff) | |
download | opensim-SC-cc67de5b86ebcebadbe2ea46872a0dc63d99cae7.zip opensim-SC-cc67de5b86ebcebadbe2ea46872a0dc63d99cae7.tar.gz opensim-SC-cc67de5b86ebcebadbe2ea46872a0dc63d99cae7.tar.bz2 opensim-SC-cc67de5b86ebcebadbe2ea46872a0dc63d99cae7.tar.xz |
rename SQLiteNG to SQLite and SQLite to SQLiteLegacy
this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG
MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone)
See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details
This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita.
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSim.ini.example | 10 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 8 | ||||
-rw-r--r-- | bin/config-include/storage/SQLiteLegacyStandalone.ini (renamed from bin/config-include/storage/SQLiteNGStandalone.ini) | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index bbc6f78..f49cd97 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -113,14 +113,14 @@ | |||
113 | 113 | ||
114 | ; --- To use sqlite as region storage: | 114 | ; --- To use sqlite as region storage: |
115 | ; | 115 | ; |
116 | ; PLEASE NOTE: Unfortunately, the SQLiteNG database plugin, while necessary to use sqlite with Mono on Linux, is | 116 | ; PLEASE NOTE: Unfortunately, the current SQLite database plugin (necessary to use SQLite with Mono on Linux) is |
117 | ; not compatible with the sqlite3 library installed on Mac OSX. If you're using Mono 2.4 you can still use the old sqlite | 117 | ; not compatible with the sqlite3 library installed on Mac OSX. If you're using Mono 2.4 you can still use the old sqlite |
118 | ; library by uncommenting the SQLite.dll storage plugin (and commenting out SQLiteNG). Unfortunately, the older library | 118 | ; library by uncommenting the SQLiteLegacy.dll storage plugin (and commenting out SQLite.dll). Unfortunately, the older library |
119 | ; 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 | 119 | ; will not work with Mono 2.6 on Mac OSX so you will either need to replace the OSX sqlite3 system library or use MySQL instead |
120 | ; | 120 | ; |
121 | ; You will also need to do the same thing in config-include/StandaloneCommon.ini if you are running in standalone mode | 121 | ; You will also need to do the same thing in config-include/StandaloneCommon.ini if you are running in standalone mode |
122 | storage_plugin = "OpenSim.Data.SQLiteNG.dll" | 122 | storage_plugin = "OpenSim.Data.SQLite.dll" |
123 | ;storage_plugin = "OpenSim.Data.SQLite.dll" | 123 | ;storage_plugin = "OpenSim.Data.SQLiteLegacy.dll" |
124 | storage_connection_string="URI=file:OpenSim.db,version=3"; | 124 | storage_connection_string="URI=file:OpenSim.db,version=3"; |
125 | 125 | ||
126 | ; --- To use MySQL storage, supply your own connection string (this is only an example): | 126 | ; --- 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 58860d1..572c153 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -6,12 +6,12 @@ | |||
6 | ; | 6 | ; |
7 | 7 | ||
8 | ; SQLite | 8 | ; SQLite |
9 | Include-Storage = "config-include/storage/SQLiteNGStandalone.ini"; | 9 | Include-Storage = "config-include/storage/SQLiteStandalone.ini"; |
10 | 10 | ||
11 | ; Unfortunately SQLiteNG is not compatible with Mac OSX. You can still use the older | 11 | ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX. You can still use the older |
12 | ; sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini for sqlite | 12 | ; legacy sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini (search for sqlite) |
13 | ; for more details | 13 | ; for more details |
14 | ;Include-Storage = "config-include/storage/SQLiteStandalone.ini"; | 14 | ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini"; |
15 | 15 | ||
16 | ; MySql | 16 | ; MySql |
17 | ; Uncomment these lines if you want to use mysql storage | 17 | ; Uncomment these lines if you want to use mysql storage |
diff --git a/bin/config-include/storage/SQLiteNGStandalone.ini b/bin/config-include/storage/SQLiteLegacyStandalone.ini index ba00aca..1d4dd29 100644 --- a/bin/config-include/storage/SQLiteNGStandalone.ini +++ b/bin/config-include/storage/SQLiteLegacyStandalone.ini | |||
@@ -1,7 +1,7 @@ | |||
1 | ; These are the initialization settings for running OpenSim Standalone with an SQLite database | 1 | ; These are the initialization settings for running OpenSim Standalone with an SQLite database |
2 | 2 | ||
3 | [DatabaseService] | 3 | [DatabaseService] |
4 | StorageProvider = "OpenSim.Data.SQLiteNG.dll" | 4 | StorageProvider = "OpenSim.Data.SQLiteLegacy.dll" |
5 | 5 | ||
6 | [AvatarService] | 6 | [AvatarService] |
7 | ConnectionString = "URI=file:avatars.db,version=3" | 7 | ConnectionString = "URI=file:avatars.db,version=3" |