aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorMelanie2012-02-02 22:36:41 +0000
committerMelanie2012-02-02 22:36:41 +0000
commit8f8b5f9a4d025c2af358e07d3dd6a2493743f89e (patch)
treed5af485139fba37f5c9c2053cc7d33cff0df6f6a /OpenSim/Server/Handlers
parentMake ban, eject, freeze and the scripted versions of those work. (diff)
parentOpenID: server connector had a copy-and-paste error that made identity querie... (diff)
downloadopensim-SC_OLD-8f8b5f9a4d025c2af358e07d3dd6a2493743f89e.zip
opensim-SC_OLD-8f8b5f9a4d025c2af358e07d3dd6a2493743f89e.tar.gz
opensim-SC_OLD-8f8b5f9a4d025c2af358e07d3dd6a2493743f89e.tar.bz2
opensim-SC_OLD-8f8b5f9a4d025c2af358e07d3dd6a2493743f89e.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Authentication/OpenIdServerConnector.cs2
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));