diff options
| author | Dan Lake | 2012-02-02 17:44:11 -0800 |
|---|---|---|
| committer | Dan Lake | 2012-02-02 17:44:11 -0800 |
| commit | 3257dbe76dff0a1e5842cafc75e4c2d09278deab (patch) | |
| tree | 7f7d1a58ca910d8acefbd3bee0c3d096a59d8a43 /OpenSim/Server | |
| parent | ObjectAddedToScene event should be fired when duplicating objects (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-3257dbe76dff0a1e5842cafc75e4c2d09278deab.zip opensim-SC-3257dbe76dff0a1e5842cafc75e4c2d09278deab.tar.gz opensim-SC-3257dbe76dff0a1e5842cafc75e4c2d09278deab.tar.bz2 opensim-SC-3257dbe76dff0a1e5842cafc75e4c2d09278deab.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server')
| -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)); |