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/StandaloneHypergrid.ini
parent: Revert "test" (diff)
parent: Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff)
download: opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.zip
opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz
opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2
opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz
1 files changed, 86 insertions, 16 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 909286c..ee84c81 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -3,28 +3,30 @@
 ;; All optional settings are in StandaloneCommon.ini.example,
 ;; which you can copy and change.
 ;;
-[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
-[Startup]
-        hypergrid = true
        
 [Modules]
    AssetServices = "HGAssetBroker"
    InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
+    NeighbourServices = "LocalNeighbourServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
+    AuthenticationServices = "LocalAuthenticationServicesConnector"
-    GridServices = "HGGridServicesConnector"
+    GridServices = "LocalGridServicesConnector"
+    PresenceServices = "LocalPresenceServicesConnector"
+    UserAccountServices = "LocalUserAccountServicesConnector"
+    SimulationServices = "RemoteSimulationConnectorModule"
+    AvatarServices = "LocalAvatarServicesConnector"
+    EntityTransferModule = "HGEntityTransferModule"
+    InventoryAccessModule = "HGInventoryAccessModule"
    InventoryServiceInConnector = true
    AssetServiceInConnector = true
    HGAuthServiceInConnector = true
    HypergridServiceInConnector = true
    NeighbourServiceInConnector = true
    LibraryModule = true
+    LLLoginServiceInConnector = true
+    AuthenticationServiceInConnector = true
+    SimulationServiceInConnector = true
 [AssetService]
-    ; For the AssetServiceInConnector
    LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
    ; For HGAssetBroker
@@ -32,23 +34,91 @@
    HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 [InventoryService]
-    ; For the InventoryServiceInConnector
    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:InventoryService"
    ; For HGInventoryBroker
    LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+[AvatarService]
+    LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
+    ConnectionString = "URI=file:avatars.db,version=3"
+[LibraryService]
+        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+        LibraryName = "OpenSim Library"
+        DefaultLibrary = "./inventory/Libraries.xml"
 [AuthorizationService]
    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 [AuthenticationService]
-    ; For the HGAuthServiceInConnector
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
+    ConnectionString = "URI=file:auth.db,version=3"
-    
 [GridService]
-    ; for the HGGridServicesConnector to instantiate
-        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
        ; LocalGridServicesConnector needs this
        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
        Realm = "regions"
+    StorageProvider = "OpenSim.Data.Null.dll"
+        
+        AllowHypergridMapSearch = true
+        
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+[UserAccountService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    ConnectionString = "URI=file:userprofiles.db,version=3"
+    ;; These are for creating new accounts by the service
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+[FriendsService]
+    LocalServiceModule = "OpenSim.Services.FriendsService.dll"
+    ConnectionString = "URI=file:friends.db,version=3"
+[Friends]
+    Connector = "OpenSim.Services.FriendsService.dll"
+[LoginService]
+    LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    
+[GatekeeperService]
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    ;; for the service
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
+    SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
+    WelcomeMessage = "Welcome, Avatar!"
+[UserAgentService]
+        LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
+        ;; for the service
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+        
+;; The interface that local users get when they are in other grids
+;; This greatly restricts the inventory operations while in other grids
+[HGInventoryService]
+    ; For the InventoryServiceInConnector
+    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:HGInventoryService"
+;; This should always be the very last thing on this file
+[Includes]
+    Include-Common = "config-include/StandaloneCommon.ini"
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/StandaloneHypergrid.ini
parent	Revert "test" (diff)
parent	Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff)
download	opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 909286c..ee84c81 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini
@@ -3,28 +3,30 @@
3	;; All optional settings are in StandaloneCommon.ini.example,	3	;; All optional settings are in StandaloneCommon.ini.example,
4	;; which you can copy and change.	4	;; which you can copy and change.
5	;;	5	;;
6
7	[Includes]
8	Include-Common = "config-include/StandaloneCommon.ini"
9
10	[Startup]
11	hypergrid = true
12		6
13	[Modules]	7	[Modules]
14	AssetServices = "HGAssetBroker"	8	AssetServices = "HGAssetBroker"
15	InventoryServices = "HGInventoryBroker"	9	InventoryServices = "HGInventoryBroker"
16	NeighbourServices = "RemoteNeighbourServicesConnector"	10	NeighbourServices = "LocalNeighbourServicesConnector"
17	AuthorizationServices = "LocalAuthorizationServicesConnector"	11	AuthenticationServices = "LocalAuthenticationServicesConnector"
18	GridServices = "HGGridServicesConnector"	12	GridServices = "LocalGridServicesConnector"
		13	PresenceServices = "LocalPresenceServicesConnector"
		14	UserAccountServices = "LocalUserAccountServicesConnector"
		15	SimulationServices = "RemoteSimulationConnectorModule"
		16	AvatarServices = "LocalAvatarServicesConnector"
		17	EntityTransferModule = "HGEntityTransferModule"
		18	InventoryAccessModule = "HGInventoryAccessModule"
19	InventoryServiceInConnector = true	19	InventoryServiceInConnector = true
20	AssetServiceInConnector = true	20	AssetServiceInConnector = true
21	HGAuthServiceInConnector = true	21	HGAuthServiceInConnector = true
22	HypergridServiceInConnector = true	22	HypergridServiceInConnector = true
23	NeighbourServiceInConnector = true	23	NeighbourServiceInConnector = true
24	LibraryModule = true	24	LibraryModule = true
		25	LLLoginServiceInConnector = true
		26	AuthenticationServiceInConnector = true
		27	SimulationServiceInConnector = true
25		28
26	[AssetService]	29	[AssetService]
27	; For the AssetServiceInConnector
28	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"	30	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
29		31
30	; For HGAssetBroker	32	; For HGAssetBroker
@@ -32,23 +34,91 @@
32	HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"	34	HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
33		35
34	[InventoryService]	36	[InventoryService]
35	; For the InventoryServiceInConnector
36	LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"	37	LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
37		38
38	; For HGInventoryBroker	39	; For HGInventoryBroker
39	LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"	40	LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
40	HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"	41	HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
41		42
		43	[AvatarService]
		44	LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
		45	ConnectionString = "URI=file:avatars.db,version=3"
		46
		47	[LibraryService]
		48	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
		49	LibraryName = "OpenSim Library"
		50	DefaultLibrary = "./inventory/Libraries.xml"
		51
42	[AuthorizationService]	52	[AuthorizationService]
43	LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"	53	LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
44		54
45	[AuthenticationService]	55	[AuthenticationService]
46	; For the HGAuthServiceInConnector	56	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
47	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"	57	ConnectionString = "URI=file:auth.db,version=3"
48		58
49	[GridService]	59	[GridService]
50	; for the HGGridServicesConnector to instantiate
51	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
52	; LocalGridServicesConnector needs this	60	; LocalGridServicesConnector needs this
53	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	61	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
54	Realm = "regions"	62	Realm = "regions"
		63	StorageProvider = "OpenSim.Data.Null.dll"
		64
		65	AllowHypergridMapSearch = true
		66
		67	[PresenceService]
		68	LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
		69	StorageProvider = "OpenSim.Data.Null.dll"
		70
		71	[UserAccountService]
		72	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		73	ConnectionString = "URI=file:userprofiles.db,version=3"
		74	;; These are for creating new accounts by the service
		75	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		76	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		77	GridService = "OpenSim.Services.GridService.dll:GridService"
		78	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
		79
		80	[FriendsService]
		81	LocalServiceModule = "OpenSim.Services.FriendsService.dll"
		82	ConnectionString = "URI=file:friends.db,version=3"
		83
		84	[Friends]
		85	Connector = "OpenSim.Services.FriendsService.dll"
		86
		87	[LoginService]
		88	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
		89	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		90	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
		91	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		92	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
		93	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		94	GridService = "OpenSim.Services.GridService.dll:GridService"
		95	AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
		96	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
		97
		98	[GatekeeperService]
		99	LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
		100	;; for the service
		101	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		102	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
		103	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		104	GridService = "OpenSim.Services.GridService.dll:GridService"
		105	AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
		106	SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
		107	WelcomeMessage = "Welcome, Avatar!"
		108
		109	[UserAgentService]
		110	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
		111	;; for the service
		112	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		113	GridService = "OpenSim.Services.GridService.dll:GridService"
		114
		115	;; The interface that local users get when they are in other grids
		116	;; This greatly restricts the inventory operations while in other grids
		117	[HGInventoryService]
		118	; For the InventoryServiceInConnector
		119	LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"
		120
		121
		122	;; This should always be the very last thing on this file
		123	[Includes]
		124	Include-Common = "config-include/StandaloneCommon.ini"