Merge branch 'master' of careminster:/var/git/careminster

1 files changed, 40 insertions, 30 deletions

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 3abf49b..370ab90 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -5,7 +5,7 @@
 ;;
 
 [Startup]
-        WorldMapModule = "HGWorldMap"
+    WorldMapModule = "HGWorldMap"
 
 [Modules]
     AssetServices                       = "HGAssetBroker"
@@ -20,12 +20,12 @@
     SimulationServices          = "RemoteSimulationConnectorModule"
     AvatarServices                      = "LocalAvatarServicesConnector"
     UserProfilesServices    = "LocalUserProfilesServicesConnector"
-        MapImageService                 = "MapImageServiceModule"
+    MapImageService                     = "MapImageServiceModule"
     EntityTransferModule        = "HGEntityTransferModule"
     InventoryAccessModule       = "HGInventoryAccessModule"
     FriendsModule                       = "HGFriendsModule"
-        UserManagementModule    = "HGUserManagementModule"
-        SearchModule                    = "BasicSearchModule"
+    UserManagementModule        = "HGUserManagementModule"
+    SearchModule                        = "BasicSearchModule"
     
     InventoryServiceInConnector                 = true
     AssetServiceInConnector                             = true
@@ -33,11 +33,21 @@
     NeighbourServiceInConnector                 = true
     LibraryModule                                               = true
     LLLoginServiceInConnector                   = true
-        GridInfoServiceInConnector                      = true
+    GridInfoServiceInConnector                  = true
     AuthenticationServiceInConnector    = true
     SimulationServiceInConnector                = true
-        MapImageServiceInConnector                      = true
-
+    MapImageServiceInConnector                  = 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.2"
+    ;   - this is the default.  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.2"
 
 [Messaging]
     MessageTransferModule = HGMessageTransferModule
@@ -64,9 +74,9 @@
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
 
 [LibraryService]
-        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-        LibraryName = "OpenSim Library"
-        DefaultLibrary = "./inventory/Libraries.xml"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -113,7 +123,7 @@
     LocalServiceModule          = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService          = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     GridUserService                     = "OpenSim.Services.UserAccountService.dll:GridUserService"
-        UserAgentService                = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    UserAgentService            = "OpenSim.Services.HypergridService.dll:UserAgentService"
     AuthenticationService       = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     InventoryService            = "OpenSim.Services.InventoryService.dll:XInventoryService"
     PresenceService                     = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -122,9 +132,9 @@
     FriendsService                      = "OpenSim.Services.FriendsService.dll:FriendsService"
    
 [MapImageService]
-        LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
-        ; in minutes
-        RefreshTime = 60
+    LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+    ; in minutes
+    RefreshTime = 60
 
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -138,8 +148,8 @@
     SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
 
 [UserAgentService]
-        LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
-        ;; for the service
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    ;; for the service
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -156,10 +166,10 @@
 [HGInventoryService]
     ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
-        ;; alternatives:
-        ;;  HG1.5, more permissive, not recommended, but still supported
+    ;; alternatives:
+    ;;  HG1.5, more permissive, not recommended, but still supported
     ;LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGInventoryService"
-        ;;  HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
+    ;;  HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
     ;LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
@@ -172,19 +182,19 @@
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
 [HGFriendsService]
-        LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
-        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
-        FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
-        UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-        GridService = "OpenSim.Services.GridService.dll:GridService"
-        PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
 
 [HGInstantMessageService]
-        LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
-        GridService = "OpenSim.Services.GridService.dll:GridService"
-        PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
-        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
-        InGatekeeper = True
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    InGatekeeper = True
 
 ;; This should always be the very last thing on this file
 [Includes]