diff options
| author | Melanie | 2010-11-16 10:22:15 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-16 10:22:15 +0000 |
| commit | e7e3c74fb738ed922905c465d6f1efac416ef2e8 (patch) | |
| tree | a98edb0028676fe4132248bdb3f508d2e57be202 /bin | |
| parent | Can't detach an object from within the script thread because it will throw. U... (diff) | |
| parent | Fix: Write asset data into Asset.db when using SQLite (diff) | |
| download | opensim-SC_OLD-e7e3c74fb738ed922905c465d6f1efac416ef2e8.zip opensim-SC_OLD-e7e3c74fb738ed922905c465d6f1efac416ef2e8.tar.gz opensim-SC_OLD-e7e3c74fb738ed922905c465d6f1efac416ef2e8.tar.bz2 opensim-SC_OLD-e7e3c74fb738ed922905c465d6f1efac416ef2e8.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/config-include/storage/SQLiteLegacyStandalone.ini | 3 | ||||
| -rw-r--r-- | bin/config-include/storage/SQLiteStandalone.ini | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/bin/config-include/storage/SQLiteLegacyStandalone.ini b/bin/config-include/storage/SQLiteLegacyStandalone.ini index facbbd6..ffe9a70 100644 --- a/bin/config-include/storage/SQLiteLegacyStandalone.ini +++ b/bin/config-include/storage/SQLiteLegacyStandalone.ini | |||
| @@ -4,6 +4,9 @@ | |||
| 4 | StorageProvider = "OpenSim.Data.SQLiteLegacy.dll" | 4 | StorageProvider = "OpenSim.Data.SQLiteLegacy.dll" |
| 5 | ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True" | 5 | ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True" |
| 6 | 6 | ||
| 7 | [AssetService] | ||
| 8 | ConnectionString = "URI=file:Asset.db,version=3" | ||
| 9 | |||
| 7 | [AvatarService] | 10 | [AvatarService] |
| 8 | ConnectionString = "URI=file:avatars.db,version=3" | 11 | ConnectionString = "URI=file:avatars.db,version=3" |
| 9 | 12 | ||
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini index 10e6991..c1de71a 100644 --- a/bin/config-include/storage/SQLiteStandalone.ini +++ b/bin/config-include/storage/SQLiteStandalone.ini | |||
| @@ -4,6 +4,9 @@ | |||
| 4 | StorageProvider = "OpenSim.Data.SQLite.dll" | 4 | StorageProvider = "OpenSim.Data.SQLite.dll" |
| 5 | ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True" | 5 | ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True" |
| 6 | 6 | ||
| 7 | [AssetService] | ||
| 8 | ConnectionString = "URI=file:Asset.db,version=3" | ||
| 9 | |||
| 7 | [InventoryService] | 10 | [InventoryService] |
| 8 | ;ConnectionString = "URI=file:inventory.db,version=3" | 11 | ;ConnectionString = "URI=file:inventory.db,version=3" |
| 9 | ; if you have a legacy inventory store use the connection string below | 12 | ; if you have a legacy inventory store use the connection string below |