aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-11-16 21:15:15 +0000
committerMelanie2010-11-16 21:15:15 +0000
commitc4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd (patch)
tree65fd5c2fc7e5b7e4cc4e48280d20e12ed84be320 /bin
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentChange the way attachments are persisted. Editing a worn attachment will now (diff)
downloadopensim-SC-c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd.zip
opensim-SC-c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd.tar.gz
opensim-SC-c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd.tar.bz2
opensim-SC-c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin')
-rw-r--r--bin/config-include/storage/SQLiteLegacyStandalone.ini3
-rw-r--r--bin/config-include/storage/SQLiteStandalone.ini3
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