aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorDiva Canto2010-01-29 18:59:41 -0800
committerDiva Canto2010-01-29 18:59:41 -0800
commit5001f61c08fea2ebfcb2590be69073d04d129d70 (patch)
tree08a0470b0b566f814209bfb803fbcc0959333bcd /bin/config-include
parentWorks for grid login. (diff)
downloadopensim-SC_OLD-5001f61c08fea2ebfcb2590be69073d04d129d70.zip
opensim-SC_OLD-5001f61c08fea2ebfcb2590be69073d04d129d70.tar.gz
opensim-SC_OLD-5001f61c08fea2ebfcb2590be69073d04d129d70.tar.bz2
opensim-SC_OLD-5001f61c08fea2ebfcb2590be69073d04d129d70.tar.xz
* HGGridConnector is no longer necessary.
* Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken.
Diffstat (limited to 'bin/config-include')
-rw-r--r--bin/config-include/GridHypergrid.ini5
-rw-r--r--bin/config-include/StandaloneHypergrid.ini7
2 files changed, 4 insertions, 8 deletions
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 6c7e32e..015ced0 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -13,7 +13,7 @@
13[Modules] 13[Modules]
14 AssetServices = "HGAssetBroker" 14 AssetServices = "HGAssetBroker"
15 InventoryServices = "HGInventoryBroker" 15 InventoryServices = "HGInventoryBroker"
16 GridServices = "HGGridServicesConnector" 16 GridServices = "RemoteGridServicesConnector"
17 AvatarServices = "RemoteAvatarServicesConnector" 17 AvatarServices = "RemoteAvatarServicesConnector"
18 NeighbourServices = "RemoteNeighbourServicesConnector" 18 NeighbourServices = "RemoteNeighbourServicesConnector"
19 AuthenticationServices = "RemoteAuthenticationServicesConnector" 19 AuthenticationServices = "RemoteAuthenticationServicesConnector"
@@ -38,10 +38,9 @@
38 HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector" 38 HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
39 39
40[GridService] 40[GridService]
41 ; for the HGGridServicesConnector to instantiate
42 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
43 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, 41 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
44 ; which in turn uses this 42 ; which in turn uses this
45 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 43 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
46 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 44 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
47 45
46 AllowHypergridMapSearch = true
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 0f8483b..395537d 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -13,9 +13,9 @@
13[Modules] 13[Modules]
14 AssetServices = "HGAssetBroker" 14 AssetServices = "HGAssetBroker"
15 InventoryServices = "HGInventoryBroker" 15 InventoryServices = "HGInventoryBroker"
16 NeighbourServices = "RemoteNeighbourServicesConnector" 16 NeighbourServices = "LocalNeighbourServicesConnector"
17 AuthenticationServices = "LocalAuthenticationServicesConnector" 17 AuthenticationServices = "LocalAuthenticationServicesConnector"
18 GridServices = "HGGridServicesConnector" 18 GridServices = "LocalGridServicesConnector"
19 PresenceServices = "LocalPresenceServicesConnector" 19 PresenceServices = "LocalPresenceServicesConnector"
20 UserAccountServices = "LocalUserAccountServicesConnector" 20 UserAccountServices = "LocalUserAccountServicesConnector"
21 SimulationServices = "RemoteSimulationConnectorModule" 21 SimulationServices = "RemoteSimulationConnectorModule"
@@ -63,9 +63,6 @@
63 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 63 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
64 64
65[GridService] 65[GridService]
66 ; for the HGGridServicesConnector to instantiate
67 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
68 AssetService = "OpenSim.Services.AssetService.dll:AssetService"
69 ; LocalGridServicesConnector needs this 66 ; LocalGridServicesConnector needs this
70 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 67 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
71 Realm = "regions" 68 Realm = "regions"