diff options
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r-- | OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs index a0a92ed..6464399 100644 --- a/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs +++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Server.Handlers.Authentication | |||
63 | 63 | ||
64 | Object[] args = new Object[] { config }; | 64 | Object[] args = new Object[] { config }; |
65 | m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, args); | 65 | m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, args); |
66 | m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(authService, args); | 66 | m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(userService, args); |
67 | 67 | ||
68 | // Handler for OpenID user identity pages | 68 | // Handler for OpenID user identity pages |
69 | server.AddStreamHandler(new OpenIdStreamHandler("GET", "/users/", m_UserAccountService, m_AuthenticationService)); | 69 | server.AddStreamHandler(new OpenIdStreamHandler("GET", "/users/", m_UserAccountService, m_AuthenticationService)); |