Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

1 files changed, 10 insertions, 0 deletions

diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
index c1de71a..67d98ff 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -7,6 +7,16 @@
 [AssetService]
     ConnectionString = "URI=file:Asset.db,version=3"
 
+; The HGAssetService section controls the connection given to the AssetService in a Hypergrid configuration.
+; This has to be separate from [AssetService] because the Hypergrid facing connector uses [HGAssetService] for its config data instead.
+; However, the internal asset service will still use the [AssetService] section.
+; Therefore, you will almost certainly want the ConnectionString in [HGAssetService] to be the same as in [AssetService] 
+; so that they both access the same database.
+; This issue does not apply to normal MySQL/MSSQL configurations, since by default they use the settings in [DatabaseService] and
+; do not have separate connection strings for different services.
+[HGAssetService]
+    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