6 files changed, 43 insertions, 6 deletions

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 10f7dbd..261c1b8 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -12,5 +12,12 @@
     InventoryServices = "RemoteInventoryServicesConnector"
     AuthorizationServices = "RemoteAuthorizationServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
+    GridServices = "RemoteGridServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
+
+[GridService]
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+        ; for the LocalGridServicesConnector which is used by the Remote one
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    
\ No newline at end of file
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3a8ec35..e9d3728 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -15,6 +15,11 @@
     ;
     InventoryServerURI = "http://myinventoryserver.com:8004"
 
+[GridService]
+    ;
+    ; change this to your grid-wide inventory server
+    ;
+    GridServerURI = "http://mygridserver.com:8001"
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
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"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 5a5cbff..a6c089c 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -25,5 +25,4 @@
 
 [GridService]
         LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-        
\ No newline at end of file
+    Realm = "regions"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index bac7983..b0e2de3 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -32,3 +32,10 @@
 [FreeswitchService]
     ;; Configuration for the freeswitch service goes here
     LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
+
+[GridService]
+    ;; For in-memory region storage (default)
+        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    ;;--- For MySql region storage (alternative)
+        ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+        ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index b14517d..baff811 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -7,16 +7,21 @@
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
 
+[Startup]
+        hypergrid = true
+        
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "LocalNeighbourServicesConnector"
+    NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "HGGridServicesConnector"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
     HypergridServiceInConnector = true
+    NeighbourServiceInConnector = true
+
 
 [AssetService]
     ; For the AssetServiceInConnector
@@ -42,6 +47,8 @@
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
     
 [GridService]
-        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    ; for the HGGridServicesConnector to instantiate
         GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
-        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
\ No newline at end of file
+        ; LocalGridServicesConnector needs this
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+        Realm = "regions"