From 7b0b5c9d97dea840e1ede6e2318b3c049c804983 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 28 Jul 2013 13:49:58 -0700
Subject: Added BasicSearchModule.cs which handles OnDirFindQuery events.
 Removed that handler from both Groups modules in core, and replaced them with
 an operation on IGroupsModule.

---
 bin/config-include/GridHypergrid.ini | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 31a4059..7edcafb 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -28,6 +28,7 @@
 	FriendsModule			= "HGFriendsModule"
 	MapImageService			= "MapImageServiceModule"
 	UserManagementModule	= "HGUserManagementModule"
+	SearchModule			= "BasicSearchModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
-- 
cgit v1.1


From ac0a527976cda9d138d1b8967e81be4767e9f332 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Sep 2013 23:27:37 +0100
Subject: Add [SimulationService] section to GridHypergrid.ini and
 StandaloneHypergrid.ini

This was already in Grid.ini and Standalone.ini
Default settings are same as previously, just introduce a debug ConnectorProtocolVersion parameter
---
 bin/config-include/GridHypergrid.ini | 11 +++++++++++
 1 file changed, 11 insertions(+)

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

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 7edcafb..d416ee9 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -35,6 +35,17 @@
     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.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"
+
 [Profile]
     Module = "BasicProfileModule"
 
-- 
cgit v1.1


From 997700c4aae2c0498e86c955cd158e89ae2d2489 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Sep 2013 23:49:27 +0100
Subject: minor: Make config-include .ini files more consistent

Chiefly tabs to spaces.
No actual setting changes
---
 bin/config-include/GridHypergrid.ini | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

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

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index d416ee9..2a66b4c 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -25,10 +25,10 @@
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-	FriendsModule			= "HGFriendsModule"
-	MapImageService			= "MapImageServiceModule"
-	UserManagementModule	= "HGUserManagementModule"
-	SearchModule			= "BasicSearchModule"
+    FriendsModule			= "HGFriendsModule"
+    MapImageService			= "MapImageServiceModule"
+    UserManagementModule	= "HGUserManagementModule"
+    SearchModule			= "BasicSearchModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
@@ -73,7 +73,7 @@
     ; Needed to display non-default map tile images for linked regions
     AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
 
-	HypergridLinker = true
+    HypergridLinker = true
     AllowHypergridMapSearch = true
 
 [LibraryService]
@@ -89,12 +89,13 @@
     LureModule = HGLureModule
 
 [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"
+
+    ; in minutes
+    RefreshTime = 60
-- 
cgit v1.1