diff options
author | Justin Clark-Casey (justincc) | 2011-03-26 02:42:50 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-03-26 02:42:50 +0000 |
commit | de0730a54ca8b2ede0727212bfc2474c0eff979f (patch) | |
tree | b24dfb687929f1c3ccdac6c81b55b2723bf1c91c | |
parent | Removing hard-coded plugin loading in favour of direct class instantiation (diff) | |
download | opensim-SC_OLD-de0730a54ca8b2ede0727212bfc2474c0eff979f.zip opensim-SC_OLD-de0730a54ca8b2ede0727212bfc2474c0eff979f.tar.gz opensim-SC_OLD-de0730a54ca8b2ede0727212bfc2474c0eff979f.tar.bz2 opensim-SC_OLD-de0730a54ca8b2ede0727212bfc2474c0eff979f.tar.xz |
Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure.
-rw-r--r-- | OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs | 5 | ||||
-rw-r--r-- | prebuild.xml | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs index 15dc5be..bcfd03d 100644 --- a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs | |||
@@ -15,8 +15,11 @@ namespace OpenSim.Services.AuthenticationService | |||
15 | public class WebkeyOrPasswordAuthenticationService : AuthenticationServiceBase, IAuthenticationService | 15 | public class WebkeyOrPasswordAuthenticationService : AuthenticationServiceBase, IAuthenticationService |
16 | { | 16 | { |
17 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 17 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
18 | |||
18 | private IConfigSource config; | 19 | private IConfigSource config; |
19 | private Dictionary<string, IAuthenticationService> svc_checks; | 20 | private Dictionary<string, IAuthenticationService> svc_checks |
21 | = new Dictionary<string, IAuthenticationService>(); | ||
22 | |||
20 | public WebkeyOrPasswordAuthenticationService(IConfigSource config) | 23 | public WebkeyOrPasswordAuthenticationService(IConfigSource config) |
21 | : base(config) | 24 | : base(config) |
22 | { | 25 | { |
diff --git a/prebuild.xml b/prebuild.xml index fac3f20..c818908 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1059,6 +1059,7 @@ | |||
1059 | <Reference name="OpenSim.Framework"/> | 1059 | <Reference name="OpenSim.Framework"/> |
1060 | <Reference name="OpenSim.Framework.Console"/> | 1060 | <Reference name="OpenSim.Framework.Console"/> |
1061 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1061 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1062 | <Reference name="OpenSim.Server.Base"/> | ||
1062 | <Reference name="OpenSim.Services.Interfaces"/> | 1063 | <Reference name="OpenSim.Services.Interfaces"/> |
1063 | <Reference name="OpenSim.Services.Base"/> | 1064 | <Reference name="OpenSim.Services.Base"/> |
1064 | <Reference name="OpenSim.Services.Connectors"/> | 1065 | <Reference name="OpenSim.Services.Connectors"/> |