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/Standalone.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, 59 insertions, 6 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index cdfdf4b..bf693a1 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -4,27 +4,80 @@
 ;; which you can copy and change.
 ;;
-[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
 [Modules]
    AssetServices = "LocalAssetServicesConnector"
    InventoryServices = "LocalInventoryServicesConnector"
    NeighbourServices = "LocalNeighbourServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
+    AuthenticationServices = "LocalAuthenticationServicesConnector"
    GridServices = "LocalGridServicesConnector"
+    PresenceServices = "LocalPresenceServicesConnector"
+    UserAccountServices = "LocalUserAccountServicesConnector"
+    SimulationServices = "LocalSimulationConnectorModule"
+    AvatarServices = "LocalAvatarServicesConnector"
+    EntityTransferModule = "BasicEntityTransferModule"
+    InventoryAccessModule = "BasicInventoryAccessModule"
    LibraryModule = true
+    LLLoginServiceInConnector = true
 [AssetService]
    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
 [InventoryService]
    LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
-    
+[LibraryService]
+        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+        LibraryName = "OpenSim Library"
+        DefaultLibrary = "./inventory/Libraries.xml"
+[AvatarService]
+    LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
+    ConnectionString = "URI=file:avatars.db,version=3"
 [AuthorizationService]
    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
+[AuthenticationService]
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    ConnectionString = "URI=file:auth.db,version=3"
 [GridService]
-        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
    Realm = "regions"
+    StorageProvider = "OpenSim.Data.Null.dll"
+[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
+    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"
+    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"
+    WelcomeMessage = "Welcome, Avatar!"
+;; 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/Standalone.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/Standalone.ini b/bin/config-include/Standalone.ini index cdfdf4b..bf693a1 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini
@@ -4,27 +4,80 @@
4	;; which you can copy and change.	4	;; which you can copy and change.
5	;;	5	;;
6		6
7	[Includes]
8	Include-Common = "config-include/StandaloneCommon.ini"
9
10	[Modules]	7	[Modules]
11	AssetServices = "LocalAssetServicesConnector"	8	AssetServices = "LocalAssetServicesConnector"
12	InventoryServices = "LocalInventoryServicesConnector"	9	InventoryServices = "LocalInventoryServicesConnector"
13	NeighbourServices = "LocalNeighbourServicesConnector"	10	NeighbourServices = "LocalNeighbourServicesConnector"
14	AuthorizationServices = "LocalAuthorizationServicesConnector"	11	AuthenticationServices = "LocalAuthenticationServicesConnector"
15	GridServices = "LocalGridServicesConnector"	12	GridServices = "LocalGridServicesConnector"
		13	PresenceServices = "LocalPresenceServicesConnector"
		14	UserAccountServices = "LocalUserAccountServicesConnector"
		15	SimulationServices = "LocalSimulationConnectorModule"
		16	AvatarServices = "LocalAvatarServicesConnector"
		17	EntityTransferModule = "BasicEntityTransferModule"
		18	InventoryAccessModule = "BasicInventoryAccessModule"
16	LibraryModule = true	19	LibraryModule = true
		20	LLLoginServiceInConnector = true
17		21
18	[AssetService]	22	[AssetService]
19	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"	23	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
20		24
21	[InventoryService]	25	[InventoryService]
22	LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"	26	LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
23		27	[LibraryService]
		28	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
		29	LibraryName = "OpenSim Library"
		30	DefaultLibrary = "./inventory/Libraries.xml"
		31
		32	[AvatarService]
		33	LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
		34	ConnectionString = "URI=file:avatars.db,version=3"
		35
24	[AuthorizationService]	36	[AuthorizationService]
25	LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"	37	LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
26		38
		39	[AuthenticationService]
		40	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		41	ConnectionString = "URI=file:auth.db,version=3"
		42
27	[GridService]	43	[GridService]
28	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	44	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
29	Realm = "regions"	45	Realm = "regions"
		46	StorageProvider = "OpenSim.Data.Null.dll"
		47
		48	[PresenceService]
		49	LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
		50	StorageProvider = "OpenSim.Data.Null.dll"
		51
		52	[UserAccountService]
		53	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		54	ConnectionString = "URI=file:userprofiles.db,version=3"
		55	;; These are for creating new accounts
		56	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		57	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		58	GridService = "OpenSim.Services.GridService.dll:GridService"
		59	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
30		60
		61	[FriendsService]
		62	LocalServiceModule = "OpenSim.Services.FriendsService.dll"
		63	ConnectionString = "URI=file:friends.db,version=3"
		64
		65	[Friends]
		66	Connector = "OpenSim.Services.FriendsService.dll"
		67
		68	[LoginService]
		69	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
		70	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		71	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		72	InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
		73	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		74	GridService = "OpenSim.Services.GridService.dll:GridService"
		75	AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
		76	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
		77
		78	WelcomeMessage = "Welcome, Avatar!"
		79
		80
		81	;; This should always be the very last thing on this file
		82	[Includes]
		83	Include-Common = "config-include/StandaloneCommon.ini"