Merge branch 'master' into vehicles

1 files changed, 13 insertions, 1 deletions

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 8b65ab8..f5aa603 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -7,13 +7,17 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
 
+[Startup]
+        hypergrid = true
+
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "RemoteNeighbourServicesConnector"
+    GridServices = "HGGridServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
-
+    HypergridServiceInConnector = true
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -22,3 +26,11 @@
 [InventoryService]
     LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+
+[GridService]
+    ; for the HGGridServicesConnector to instantiate
+        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
+        ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
+        ; which in turn uses this
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"