aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-01-10 01:46:56 +0000
committerMelanie2010-01-10 01:46:56 +0000
commit7403f2fd366cc96cd65ba95d7fba68dce1846982 (patch)
treed96022c04cb73cd8da0a57fe6c96589ada2819a0 /bin
parentFinally the region service config stuff is in. (diff)
parent* Moved command reset password from OpenSim to UserAccountService. (diff)
downloadopensim-SC_OLD-7403f2fd366cc96cd65ba95d7fba68dce1846982.zip
opensim-SC_OLD-7403f2fd366cc96cd65ba95d7fba68dce1846982.tar.gz
opensim-SC_OLD-7403f2fd366cc96cd65ba95d7fba68dce1846982.tar.bz2
opensim-SC_OLD-7403f2fd366cc96cd65ba95d7fba68dce1846982.tar.xz
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
Diffstat (limited to '')
-rw-r--r--bin/config-include/StandaloneHypergrid.ini6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 5e54cde..feca115 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -67,7 +67,11 @@
67 67
68[UserAccountService] 68[UserAccountService]
69 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" 69 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
70 70 ;; These are for creating new accounts
71 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
72 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
73 GridService = "OpenSim.Services.GridService.dll:GridService"
74
71[LoginService] 75[LoginService]
72 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" 76 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
73 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" 77 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"