8 files changed, 29 insertions, 10 deletions

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 71ce6ad..46dbc17 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -110,6 +110,8 @@
     ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
     ; UserProfilesServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:UserProfilesConnector"
 
+        ;; Uncomment if you want to have centralized estate data
+        ; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
@@ -379,6 +381,8 @@
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
 
+[EstateService]
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [LibraryService]
     LibraryName = "OpenSim Library"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index a7b39a3..687bb2e 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -89,6 +89,9 @@
     ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
     ; UserProfilesServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:UserProfilesConnector"
 
+        ;; Uncomment if you want to have centralized estate data
+        ; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
+
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
 ; *
@@ -339,6 +342,8 @@
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
 
+[EstateService]
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [LibraryService]
     LibraryName = "OpenSim Library"
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index e9eaee3..42ecec2 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -46,10 +46,10 @@
     ConnectorProtocolVersion = "SIMULATION/0.3"
 
 [SimulationDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+    LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 
 [EstateDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 903641e..bffc504 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -108,6 +108,16 @@
     ;; Robust server in port ${Const|PublicPort}, but not always)
     Gatekeeper="${Const|BaseURL}:${Const|PublicPort}"
 
+[EstateDataStore]
+        ;
+        ; Uncomment if you want centralized estate data at robust server,
+        ; in which case the URL in [EstateService] will be used
+        ;
+        ;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataConnector"
+
+[EstateService]
+        EstateServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
+
 [Messaging]
     ; === HG ONLY ===
     ;; Change this to the address of your Gatekeeper service
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 8dadd76..8b47ede 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -54,10 +54,10 @@
     Module = "BasicProfileModule"
 
 [SimulationDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+    LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 
 [EstateDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 311a55b..8e42fab 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -42,10 +42,10 @@
     AssetCaching = "FlotsamAssetCache"
 
 [SimulationDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+    LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 
 [EstateDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [Friends]
     Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 887f4d8..398a76c 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -43,10 +43,10 @@
     ConnectorProtocolVersion = "SIMULATION/0.3"
 
 [SimulationDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+    LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 
 [EstateDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a3c7fa6..102947a 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -58,10 +58,10 @@
     LureModule = HGLureModule
 
 [SimulationDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+    LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 
 [EstateDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [AssetService]
     LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"