From 9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 18 Jan 2010 20:35:59 -0800
Subject: * Towards enabling hyperlinks at grid-level. * Updated grid configs

---
 bin/OpenSim.Server.ini.example       |  5 +++--
 bin/config-include/GridHypergrid.ini | 13 ++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 3d2a5ba..0c6046f 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -42,7 +42,6 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S
 ; *
 [InventoryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
-    UserServerURI = "http://127.0.0.1:8002"
     SessionAuthentication = "false"
     StorageProvider = "OpenSim.Data.MySQL.dll"
     ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
@@ -58,10 +57,12 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S
     Realm = "regions"
     ; AllowDuplicateNames = "True"
     ;; Next, we can specify properties of regions, including default and fallback regions
-    ;; The syntax is: Region_<RegioName> = "<flags>"
+    ;; The syntax is: Region_<RegionName> = "<flags>"
+    ;; or:            Region_<RegionID> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate
     ;; For example: 
     ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
+    ; (replace spaces with underscore)
 
 ; * This is the configuration for the freeswitch server in grid mode
 [FreeswitchService]
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 4b6bc17..4885a41 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -17,18 +17,17 @@
     AvatarServices = "RemoteAvatarServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthenticationServices = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices = "LocalAuthorizationServicesConnector"
     PresenceServices = "RemotePresenceServicesConnector"
     UserAccountServices = "RemoteUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
-    EntityTransferModule = "BasicEntityTransferModule"
+    EntityTransferModule = "HGEntityTransferModule"
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
-    HypergridServiceInConnector = true
     SimulationServiceInConnector = true
     LibraryModule = true
     InventoryServiceInConnector = false
     AssetServiceInConnector = false
-    LLLoginServiceInConnector = false
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -41,12 +40,12 @@
 [GridService]
     ; for the HGGridServicesConnector to instantiate
     GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
+	HypergridService = "OpenSim.Services.HypergridService.dll:HypergridService"
 	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
 	; which in turn uses this
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
-[LibraryService]
-    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-    LibraryName = "OpenSim Library"
-    DefaultLibrary = "./inventory/Libraries.xml"
+[HypergridService]
+	GridService = "OpenSim.Services.GridService.dll:GridService"
+	AssetService = "OpenSim.Services.AssetService.dll:AssetService"
-- 
cgit v1.1