Merge https://github.com/opensim/opensim into mantis5110

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

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 @@
     StorageProvider = "OpenSim.Data.SQLiteLegacy.dll"
     ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True"
 
+[AssetService]
+    ConnectionString = "URI=file:Asset.db,version=3"
+
 [AvatarService]
     ConnectionString = "URI=file:avatars.db,version=3"
 
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 @@
     StorageProvider = "OpenSim.Data.SQLite.dll"
     ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True"
 
+[AssetService]
+    ConnectionString = "URI=file:Asset.db,version=3"
+
 [InventoryService]
     ;ConnectionString = "URI=file:inventory.db,version=3"
     ; if you have a legacy inventory store use the connection string below