Merge branch 'master' into careminster-presence-refactor

This brings careminster on the level of master. To be tested
author: Melanie 2010-03-03 02:07:03 +0000
committer: Melanie 2010-03-03 02:07:03 +0000
commit: 028a87fe37002e7a0611f66babf1deee46c83804 (patch)
tree: 387aec499fd60c2012bed8148e6a2ddc847c3d95 /bin/config-include/Grid.ini
parent: Revert "test" (diff)
parent: Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff)
download: opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip
opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz
opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2
opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz
1 files changed, 22 insertions, 7 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 5b19130..9dff325 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -10,15 +10,30 @@
 [Modules]
    AssetServices = "RemoteAssetServicesConnector"
    InventoryServices = "RemoteInventoryServicesConnector"
-    AuthorizationServices = "RemoteAuthorizationServicesConnector"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
    GridServices = "RemoteGridServicesConnector"
-    NeighbourServiceInConnector = true
+    AvatarServices = "RemoteAvatarServicesConnector"
+    NeighbourServices = "RemoteNeighbourServicesConnector"
+    AuthenticationServices = "RemoteAuthenticationServicesConnector"
+    PresenceServices = "RemotePresenceServicesConnector"
+    UserAccountServices = "RemoteUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    EntityTransferModule = "BasicEntityTransferModule"
+    InventoryAccessModule = "BasicInventoryAccessModule"
    LandServiceInConnector = true
-    LLProxyLoginModule = true
+    NeighbourServiceInConnector = true
+    SimulationServiceInConnector = true
+    LibraryModule = true
 [GridService]
-        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-        ; for the LocalGridServicesConnector which is used by the Remote one
+    ; for the LocalGridServicesConnector which is used by the Remote one
    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-    
-\ No newline at end of file
+    
+[LibraryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
+[Friends]
+    Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
author	Melanie	2010-03-03 02:07:03 +0000
committer	Melanie	2010-03-03 02:07:03 +0000
commit	028a87fe37002e7a0611f66babf1deee46c83804 (patch)
tree	387aec499fd60c2012bed8148e6a2ddc847c3d95 /bin/config-include/Grid.ini
parent	Revert "test" (diff)
parent	Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff)
download	opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 5b19130..9dff325 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini
@@ -10,15 +10,30 @@
10	[Modules]	10	[Modules]
11	AssetServices = "RemoteAssetServicesConnector"	11	AssetServices = "RemoteAssetServicesConnector"
12	InventoryServices = "RemoteInventoryServicesConnector"	12	InventoryServices = "RemoteInventoryServicesConnector"
13	AuthorizationServices = "RemoteAuthorizationServicesConnector"
14	NeighbourServices = "RemoteNeighbourServicesConnector"
15	GridServices = "RemoteGridServicesConnector"	13	GridServices = "RemoteGridServicesConnector"
16	NeighbourServiceInConnector = true	14	AvatarServices = "RemoteAvatarServicesConnector"
		15	NeighbourServices = "RemoteNeighbourServicesConnector"
		16	AuthenticationServices = "RemoteAuthenticationServicesConnector"
		17	PresenceServices = "RemotePresenceServicesConnector"
		18	UserAccountServices = "RemoteUserAccountServicesConnector"
		19	SimulationServices = "RemoteSimulationConnectorModule"
		20	EntityTransferModule = "BasicEntityTransferModule"
		21	InventoryAccessModule = "BasicInventoryAccessModule"
17	LandServiceInConnector = true	22	LandServiceInConnector = true
18	LLProxyLoginModule = true	23	NeighbourServiceInConnector = true
		24	SimulationServiceInConnector = true
		25	LibraryModule = true
		26
19		27
20	[GridService]	28	[GridService]
21	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	29	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
22	; for the LocalGridServicesConnector which is used by the Remote one	30	; for the LocalGridServicesConnector which is used by the Remote one
23	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"	31	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
24	\ No newline at end of file	32
		33	[LibraryService]
		34	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
		35	LibraryName = "OpenSim Library"
		36	DefaultLibrary = "./inventory/Libraries.xml"
		37
		38	[Friends]
		39	Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"