diff options
| author | Melanie | 2010-04-30 19:29:21 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-30 19:29:21 +0100 |
| commit | 23282935f1f25fd44d85193f3c13ea97c755f75c (patch) | |
| tree | 689d44f5657dd36e74c3b4d4dd508c86ee90cea1 /bin/config-include | |
| parent | Fix a null ref from trying to access a dictionary that was never initialized. (diff) | |
| parent | * XInventory fairly tested, including for HG. Almost ready to switch. (diff) | |
| download | opensim-SC-23282935f1f25fd44d85193f3c13ea97c755f75c.zip opensim-SC-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.gz opensim-SC-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.bz2 opensim-SC-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin/config-include')
| -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 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 74bdbe2..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 | ; Uncomment this line if you want to use sqlite storage with Mono 2.4 | ||
| 10 | Include-Storage = "config-include/storage/SQLiteStandalone.ini"; | 9 | Include-Storage = "config-include/storage/SQLiteStandalone.ini"; |
| 11 | 10 | ||
| 12 | ; If you want to use sqlite with Mono 2.6 and above, uncomment this line instead. | 11 | ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX. You can still use the older |
| 13 | ; Don't forget to do the same thing for the storage_plugin setting in OpenSim.ini | 12 | ; legacy sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini (search for sqlite) |
| 14 | ; Include-Storage = "config-include/storage/SQLiteNGStandalone.ini"; | 13 | ; for more details |
| 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" |