Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-05-08 13:31:36 +0100
committer: Melanie 2010-05-08 13:31:36 +0100
commit: 14fcc2510ef9f1effc06d7e99b57f7f74de08eac (patch)
tree: e52f145ef2aac9a9cc7fb32a6a40e62f67991743 /bin/config-include/Standalone.ini
parent: Merge branch 'master' into careminster-presence-refactor (diff)
parent: test commit for panda (diff)
download: opensim-SC_OLD-14fcc2510ef9f1effc06d7e99b57f7f74de08eac.zip
opensim-SC_OLD-14fcc2510ef9f1effc06d7e99b57f7f74de08eac.tar.gz
opensim-SC_OLD-14fcc2510ef9f1effc06d7e99b57f7f74de08eac.tar.bz2
opensim-SC_OLD-14fcc2510ef9f1effc06d7e99b57f7f74de08eac.tar.xz
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 027b4ea..6b7dc50 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -17,8 +17,9 @@
    AvatarServices          = "LocalAvatarServicesConnector"
    EntityTransferModule    = "BasicEntityTransferModule"
    InventoryAccessModule   = "BasicInventoryAccessModule"
-    LibraryModule = true
+    
-    LLLoginServiceInConnector = true
+    LibraryModule                               = true
+    LLLoginServiceInConnector   = true
 [AssetService]
    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -54,7 +55,7 @@
    ;; These are for creating new accounts
    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
    GridService = "OpenSim.Services.GridService.dll:GridService"
    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
@@ -70,6 +71,7 @@
 [LoginService]
    LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
    UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService               = "OpenSim.Services.UserAccountService.dll:GridUserService"
    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
    InventoryService      = "OpenSim.Services.InventoryService.dll:XInventoryService"
    PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
author	Melanie	2010-05-08 13:31:36 +0100
committer	Melanie	2010-05-08 13:31:36 +0100
commit	14fcc2510ef9f1effc06d7e99b57f7f74de08eac (patch)
tree	e52f145ef2aac9a9cc7fb32a6a40e62f67991743 /bin/config-include/Standalone.ini
parent	Merge branch 'master' into careminster-presence-refactor (diff)
parent	test commit for panda (diff)
download	opensim-SC_OLD-14fcc2510ef9f1effc06d7e99b57f7f74de08eac.zip opensim-SC_OLD-14fcc2510ef9f1effc06d7e99b57f7f74de08eac.tar.gz opensim-SC_OLD-14fcc2510ef9f1effc06d7e99b57f7f74de08eac.tar.bz2 opensim-SC_OLD-14fcc2510ef9f1effc06d7e99b57f7f74de08eac.tar.xz

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 027b4ea..6b7dc50 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini
@@ -17,8 +17,9 @@
17	AvatarServices = "LocalAvatarServicesConnector"	17	AvatarServices = "LocalAvatarServicesConnector"
18	EntityTransferModule = "BasicEntityTransferModule"	18	EntityTransferModule = "BasicEntityTransferModule"
19	InventoryAccessModule = "BasicInventoryAccessModule"	19	InventoryAccessModule = "BasicInventoryAccessModule"
20	LibraryModule = true	20
21	LLLoginServiceInConnector = true	21	LibraryModule = true
		22	LLLoginServiceInConnector = true
22		23
23	[AssetService]	24	[AssetService]
24	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"	25	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -54,7 +55,7 @@
54		55
55	;; These are for creating new accounts	56	;; These are for creating new accounts
56	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"	57	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
57	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"	58	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
58	GridService = "OpenSim.Services.GridService.dll:GridService"	59	GridService = "OpenSim.Services.GridService.dll:GridService"
59	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"	60	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
60		61
@@ -70,6 +71,7 @@
70	[LoginService]	71	[LoginService]
71	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"	72	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
72	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"	73	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		74	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
73	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"	75	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
74	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"	76	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
75	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"	77	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"