aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2010-01-18 20:35:59 -0800
committerDiva Canto2010-01-18 20:35:59 -0800
commit9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8 (patch)
treeb81216bbac54d79b6011657ed58e7957f0d1f13e /bin
parentCheck for impersonations at the Gatekeeper. (diff)
downloadopensim-SC_OLD-9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8.zip
opensim-SC_OLD-9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8.tar.gz
opensim-SC_OLD-9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8.tar.bz2
opensim-SC_OLD-9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8.tar.xz
* Towards enabling hyperlinks at grid-level.
* Updated grid configs
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.Server.ini.example5
-rw-r--r--bin/config-include/GridHypergrid.ini13
2 files changed, 9 insertions, 9 deletions
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
42; * 42; *
43[InventoryService] 43[InventoryService]
44 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 44 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
45 UserServerURI = "http://127.0.0.1:8002"
46 SessionAuthentication = "false" 45 SessionAuthentication = "false"
47 StorageProvider = "OpenSim.Data.MySQL.dll" 46 StorageProvider = "OpenSim.Data.MySQL.dll"
48 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" 47 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
@@ -58,10 +57,12 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S
58 Realm = "regions" 57 Realm = "regions"
59 ; AllowDuplicateNames = "True" 58 ; AllowDuplicateNames = "True"
60 ;; Next, we can specify properties of regions, including default and fallback regions 59 ;; Next, we can specify properties of regions, including default and fallback regions
61 ;; The syntax is: Region_<RegioName> = "<flags>" 60 ;; The syntax is: Region_<RegionName> = "<flags>"
61 ;; or: Region_<RegionID> = "<flags>"
62 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate 62 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate
63 ;; For example: 63 ;; For example:
64 ; Region_Welcome_Area = "DefaultRegion, FallbackRegion" 64 ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
65 ; (replace spaces with underscore)
65 66
66; * This is the configuration for the freeswitch server in grid mode 67; * This is the configuration for the freeswitch server in grid mode
67[FreeswitchService] 68[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 @@
17 AvatarServices = "RemoteAvatarServicesConnector" 17 AvatarServices = "RemoteAvatarServicesConnector"
18 NeighbourServices = "RemoteNeighbourServicesConnector" 18 NeighbourServices = "RemoteNeighbourServicesConnector"
19 AuthenticationServices = "RemoteAuthenticationServicesConnector" 19 AuthenticationServices = "RemoteAuthenticationServicesConnector"
20 AuthorizationServices = "LocalAuthorizationServicesConnector"
20 PresenceServices = "RemotePresenceServicesConnector" 21 PresenceServices = "RemotePresenceServicesConnector"
21 UserAccountServices = "RemoteUserAccountServicesConnector" 22 UserAccountServices = "RemoteUserAccountServicesConnector"
22 SimulationServices = "RemoteSimulationConnectorModule" 23 SimulationServices = "RemoteSimulationConnectorModule"
23 EntityTransferModule = "BasicEntityTransferModule" 24 EntityTransferModule = "HGEntityTransferModule"
24 LandServiceInConnector = true 25 LandServiceInConnector = true
25 NeighbourServiceInConnector = true 26 NeighbourServiceInConnector = true
26 HypergridServiceInConnector = true
27 SimulationServiceInConnector = true 27 SimulationServiceInConnector = true
28 LibraryModule = true 28 LibraryModule = true
29 InventoryServiceInConnector = false 29 InventoryServiceInConnector = false
30 AssetServiceInConnector = false 30 AssetServiceInConnector = false
31 LLLoginServiceInConnector = false
32 31
33[AssetService] 32[AssetService]
34 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" 33 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -41,12 +40,12 @@
41[GridService] 40[GridService]
42 ; for the HGGridServicesConnector to instantiate 41 ; for the HGGridServicesConnector to instantiate
43 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector" 42 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
43 HypergridService = "OpenSim.Services.HypergridService.dll:HypergridService"
44 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, 44 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
45 ; which in turn uses this 45 ; which in turn uses this
46 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 46 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
47 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 47 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
48 48
49[LibraryService] 49[HypergridService]
50 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" 50 GridService = "OpenSim.Services.GridService.dll:GridService"
51 LibraryName = "OpenSim Library" 51 AssetService = "OpenSim.Services.AssetService.dll:AssetService"
52 DefaultLibrary = "./inventory/Libraries.xml"