diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-04 00:04:26 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-04 00:04:26 -0400 |
| commit | 9f05edab04b7c592767b4875b00cec8468121744 (patch) | |
| tree | 038c4955e4bbabd7ed2cd67443676480ca52f25a /OpenSim/Server | |
| parent | * Fixes the function 'GetTerrainHeightAtXY' (diff) | |
| parent | More work on new authentication service (diff) | |
| download | opensim-SC-9f05edab04b7c592767b4875b00cec8468121744.zip opensim-SC-9f05edab04b7c592767b4875b00cec8468121744.tar.gz opensim-SC-9f05edab04b7c592767b4875b00cec8468121744.tar.bz2 opensim-SC-9f05edab04b7c592767b4875b00cec8468121744.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs index c3c2f69..03a7980 100644 --- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs +++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs | |||
| @@ -36,7 +36,7 @@ namespace OpenSim.Server.Handlers.Authentication | |||
| 36 | { | 36 | { |
| 37 | public class AuthenticationServiceConnector : ServiceConnector | 37 | public class AuthenticationServiceConnector : ServiceConnector |
| 38 | { | 38 | { |
| 39 | //private IAuthenticationService m_AuthenticationService; | 39 | private IAuthenticationService m_AuthenticationService; |
| 40 | 40 | ||
| 41 | public AuthenticationServiceConnector(IConfigSource config, IHttpServer server) : | 41 | public AuthenticationServiceConnector(IConfigSource config, IHttpServer server) : |
| 42 | base(config, server) | 42 | base(config, server) |
| @@ -51,8 +51,8 @@ namespace OpenSim.Server.Handlers.Authentication | |||
| 51 | if (authenticationService == String.Empty) | 51 | if (authenticationService == String.Empty) |
| 52 | throw new Exception("No AuthenticationService in config file"); | 52 | throw new Exception("No AuthenticationService in config file"); |
| 53 | 53 | ||
| 54 | //Object[] args = new Object[] { config }; | 54 | Object[] args = new Object[] { config }; |
| 55 | //m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args); | 55 | m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args); |
| 56 | 56 | ||
| 57 | //server.AddStreamHandler(new AuthenticationServerGetHandler(m_AuthenticationService)); | 57 | //server.AddStreamHandler(new AuthenticationServerGetHandler(m_AuthenticationService)); |
| 58 | } | 58 | } |