From 134f86e8d5c414409631b25b8c6f0ee45fbd8631 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 3 Nov 2016 21:44:39 +1000
Subject: Initial update to OpenSim 0.8.2.1 source code.

---
 bin/config-include/GridHypergrid.ini | 80 +++++++++++++++++++++---------------
 1 file changed, 47 insertions(+), 33 deletions(-)

(limited to 'bin/config-include/GridHypergrid.ini')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 55e1e6a..aa64c2a 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -8,40 +8,57 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Startup]
-	WorldMapModule = "HGWorldMap"
+    WorldMapModule = "HGWorldMap"
 
 [Modules]
-    AssetServices			= "HGAssetBroker"
-    InventoryServices		= "HGInventoryBroker"
-    GridServices			= "RemoteGridServicesConnector"
-    AvatarServices			= "RemoteAvatarServicesConnector"
-    NeighbourServices		= "RemoteNeighbourServicesConnector"
-    AuthenticationServices	= "RemoteAuthenticationServicesConnector"
-    AuthorizationServices	= "LocalAuthorizationServicesConnector"
-    PresenceServices		= "RemotePresenceServicesConnector"
-    UserAccountServices		= "RemoteUserAccountServicesConnector"
-    GridUserServices		= "RemoteGridUserServicesConnector"
-    SimulationServices		= "RemoteSimulationConnectorModule"
-    EntityTransferModule	= "HGEntityTransferModule"
-    InventoryAccessModule	= "HGInventoryAccessModule"
+    AssetServices           = "HGAssetBroker"
+    InventoryServices       = "HGInventoryBroker"
+    GridServices            = "RemoteGridServicesConnector"
+    AvatarServices          = "RemoteAvatarServicesConnector"
+    NeighbourServices       = "RemoteNeighbourServicesConnector"
+    AuthenticationServices  = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
+    PresenceServices        = "RemotePresenceServicesConnector"
+    UserAccountServices     = "RemoteUserAccountServicesConnector"
+    AgentPreferencesServices= "RemoteAgentPreferencesServicesConnector"
+    GridUserServices        = "RemoteGridUserServicesConnector"
+    SimulationServices      = "RemoteSimulationConnectorModule"
+    EntityTransferModule    = "HGEntityTransferModule"
+    InventoryAccessModule   = "HGInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-	FriendsModule			= "HGFriendsModule"
-	MapImageService			= "MapImageServiceModule"
-	UserManagementModule	= "HGUserManagementModule"
+    FriendsModule           = "HGFriendsModule"
+    MapImageService         = "MapImageServiceModule"
+    UserManagementModule    = "HGUserManagementModule"
+    SearchModule            = "BasicSearchModule"
     
-    LandServiceInConnector			= true
-    NeighbourServiceInConnector		= true
-    SimulationServiceInConnector	= true
-    LibraryModule					= true
+    LandServiceInConnector        = true
+    NeighbourServiceInConnector   = true
+    SimulationServiceInConnector  = true
+    LibraryModule                 = true
+
+[SimulationService]
+    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+    ; It is used to control the teleport handoff process.
+    ; Valid values are 
+    ; "SIMULATION/0.3" 
+    ;   - This is the default, and it supports teleports to variable-sized regions
+    ;   - Older versions can teleport to this one, but only if the destination region
+    ;     is 256x256
+    ; "SIMULATION/0.2"
+    ;   - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    ConnectorProtocolVersion = "SIMULATION/0.3"
 
 [Profile]
     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"
@@ -61,8 +78,9 @@
     ; Needed to display non-default map tile images for linked regions
     AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
 
-	HypergridLinker = true
+    HypergridLinker = true
     AllowHypergridMapSearch = true
+    SuppressConsoleCommands = true
 
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -74,17 +92,13 @@
 
 [Messaging]
     MessageTransferModule = HGMessageTransferModule
-    ; HG lures break normal in grid lures, so don't use them.
     LureModule = HGLureModule
-    LureModule = LureModule
 
 [HGInstantMessageService]
-	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
-	GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
-	PresenceService	= "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
-	UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+    GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+    PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
+    UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
 
 [MapImageService]
-	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
-	; in minutes
-	RefreshTime = 60
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
-- 
cgit v1.1