* HGGridConnector is no longer necessary.

* Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken.

2 files changed, 4 insertions, 8 deletions

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 6c7e32e..015ced0 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -13,7 +13,7 @@
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    GridServices = "HGGridServicesConnector"
+    GridServices = "RemoteGridServicesConnector"
     AvatarServices = "RemoteAvatarServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthenticationServices = "RemoteAuthenticationServicesConnector"
@@ -38,10 +38,9 @@
     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"
 
+        AllowHypergridMapSearch = true
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 0f8483b..395537d 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -13,9 +13,9 @@
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
+    NeighbourServices = "LocalNeighbourServicesConnector"
     AuthenticationServices = "LocalAuthenticationServicesConnector"
-    GridServices = "HGGridServicesConnector"
+    GridServices = "LocalGridServicesConnector"
     PresenceServices = "LocalPresenceServicesConnector"
     UserAccountServices = "LocalUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
@@ -63,9 +63,6 @@
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     
 [GridService]
-    ; for the HGGridServicesConnector to instantiate
-        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
-        AssetService = "OpenSim.Services.AssetService.dll:AssetService"
         ; LocalGridServicesConnector needs this
         LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
         Realm = "regions"