1 files changed, 47 insertions, 33 deletions
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"
+    AssetServices           = "HGAssetBroker"
-    InventoryServices           = "HGInventoryBroker"
+    InventoryServices       = "HGInventoryBroker"
-    GridServices                        = "RemoteGridServicesConnector"
+    GridServices            = "RemoteGridServicesConnector"
-    AvatarServices                      = "RemoteAvatarServicesConnector"
+    AvatarServices          = "RemoteAvatarServicesConnector"
-    NeighbourServices           = "RemoteNeighbourServicesConnector"
+    NeighbourServices       = "RemoteNeighbourServicesConnector"
-    AuthenticationServices      = "RemoteAuthenticationServicesConnector"
+    AuthenticationServices  = "RemoteAuthenticationServicesConnector"
-    AuthorizationServices       = "LocalAuthorizationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
-    PresenceServices            = "RemotePresenceServicesConnector"
+    PresenceServices        = "RemotePresenceServicesConnector"
-    UserAccountServices         = "RemoteUserAccountServicesConnector"
+    UserAccountServices     = "RemoteUserAccountServicesConnector"
-    GridUserServices            = "RemoteGridUserServicesConnector"
+    AgentPreferencesServices= "RemoteAgentPreferencesServicesConnector"
-    SimulationServices          = "RemoteSimulationConnectorModule"
+    GridUserServices        = "RemoteGridUserServicesConnector"
-    EntityTransferModule        = "HGEntityTransferModule"
+    SimulationServices      = "RemoteSimulationConnectorModule"
-    InventoryAccessModule       = "HGInventoryAccessModule"
+    EntityTransferModule    = "HGEntityTransferModule"
+    InventoryAccessModule   = "HGInventoryAccessModule"
    LandServices            = "RemoteLandServicesConnector"
-        FriendsModule                   = "HGFriendsModule"
+    FriendsModule           = "HGFriendsModule"
-        MapImageService                 = "MapImageServiceModule"
+    MapImageService         = "MapImageServiceModule"
-        UserManagementModule    = "HGUserManagementModule"
+    UserManagementModule    = "HGUserManagementModule"
+    SearchModule            = "BasicSearchModule"
    
-    LandServiceInConnector                      = true
+    LandServiceInConnector        = true
-    NeighbourServiceInConnector         = true
+    NeighbourServiceInConnector   = true
-    SimulationServiceInConnector        = true
+    SimulationServiceInConnector  = true
-    LibraryModule                                       = 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"
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
-        GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+    GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
-        PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
+    PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
-        UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
+    UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
 [MapImageService]
-        LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
-        ; in minutes
-        RefreshTime = 60

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 @@
8	Include-Common = "config-include/GridCommon.ini"	8	Include-Common = "config-include/GridCommon.ini"
9		9
10	[Startup]	10	[Startup]
11	WorldMapModule = "HGWorldMap"	11	WorldMapModule = "HGWorldMap"
12		12
13	[Modules]	13	[Modules]
14	AssetServices = "HGAssetBroker"	14	AssetServices = "HGAssetBroker"
15	InventoryServices = "HGInventoryBroker"	15	InventoryServices = "HGInventoryBroker"
16	GridServices = "RemoteGridServicesConnector"	16	GridServices = "RemoteGridServicesConnector"
17	AvatarServices = "RemoteAvatarServicesConnector"	17	AvatarServices = "RemoteAvatarServicesConnector"
18	NeighbourServices = "RemoteNeighbourServicesConnector"	18	NeighbourServices = "RemoteNeighbourServicesConnector"
19	AuthenticationServices = "RemoteAuthenticationServicesConnector"	19	AuthenticationServices = "RemoteAuthenticationServicesConnector"
20	AuthorizationServices = "LocalAuthorizationServicesConnector"	20	AuthorizationServices = "LocalAuthorizationServicesConnector"
21	PresenceServices = "RemotePresenceServicesConnector"	21	PresenceServices = "RemotePresenceServicesConnector"
22	UserAccountServices = "RemoteUserAccountServicesConnector"	22	UserAccountServices = "RemoteUserAccountServicesConnector"
23	GridUserServices = "RemoteGridUserServicesConnector"	23	AgentPreferencesServices= "RemoteAgentPreferencesServicesConnector"
24	SimulationServices = "RemoteSimulationConnectorModule"	24	GridUserServices = "RemoteGridUserServicesConnector"
25	EntityTransferModule = "HGEntityTransferModule"	25	SimulationServices = "RemoteSimulationConnectorModule"
26	InventoryAccessModule = "HGInventoryAccessModule"	26	EntityTransferModule = "HGEntityTransferModule"
		27	InventoryAccessModule = "HGInventoryAccessModule"
27	LandServices = "RemoteLandServicesConnector"	28	LandServices = "RemoteLandServicesConnector"
28	FriendsModule = "HGFriendsModule"	29	FriendsModule = "HGFriendsModule"
29	MapImageService = "MapImageServiceModule"	30	MapImageService = "MapImageServiceModule"
30	UserManagementModule = "HGUserManagementModule"	31	UserManagementModule = "HGUserManagementModule"
		32	SearchModule = "BasicSearchModule"
31		33
32	LandServiceInConnector = true	34	LandServiceInConnector = true
33	NeighbourServiceInConnector = true	35	NeighbourServiceInConnector = true
34	SimulationServiceInConnector = true	36	SimulationServiceInConnector = true
35	LibraryModule = true	37	LibraryModule = true
		38
		39	[SimulationService]
		40	; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
		41	; It is used to control the teleport handoff process.
		42	; Valid values are
		43	; "SIMULATION/0.3"
		44	; - This is the default, and it supports teleports to variable-sized regions
		45	; - Older versions can teleport to this one, but only if the destination region
		46	; is 256x256
		47	; "SIMULATION/0.2"
		48	; - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
		49	; - this protocol is more efficient than "SIMULATION/0.1"
		50	; "SIMULATION/0.1"
		51	; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
		52	ConnectorProtocolVersion = "SIMULATION/0.3"
36		53
37	[Profile]	54	[Profile]
38	Module = "BasicProfileModule"	55	Module = "BasicProfileModule"
39		56
40	[SimulationDataStore]	57	[SimulationDataStore]
41	LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"	58	LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
42		59
43	[EstateDataStore]	60	[EstateDataStore]
44	LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"	61	LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
45		62
46	[AssetService]	63	[AssetService]
47	LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"	64	LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -61,8 +78,9 @@
61	; Needed to display non-default map tile images for linked regions	78	; Needed to display non-default map tile images for linked regions
62	AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"	79	AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
63		80
64	HypergridLinker = true	81	HypergridLinker = true
65	AllowHypergridMapSearch = true	82	AllowHypergridMapSearch = true
		83	SuppressConsoleCommands = true
66		84
67	[LibraryService]	85	[LibraryService]
68	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"	86	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -74,17 +92,13 @@
74		92
75	[Messaging]	93	[Messaging]
76	MessageTransferModule = HGMessageTransferModule	94	MessageTransferModule = HGMessageTransferModule
77	; HG lures break normal in grid lures, so don't use them.
78	LureModule = HGLureModule	95	LureModule = HGLureModule
79	LureModule = LureModule
80		96
81	[HGInstantMessageService]	97	[HGInstantMessageService]
82	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"	98	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
83	GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"	99	GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
84	PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"	100	PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
85	UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"	101	UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
86		102
87	[MapImageService]	103	[MapImageService]
88	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"	104	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
89	; in minutes
90	RefreshTime = 60