diff options
| author | Diva Canto | 2009-09-26 07:49:04 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-09-26 07:49:04 -0700 |
| commit | 7253a9453e25560396e4f8c25402012b840ed0c4 (patch) | |
| tree | 0291b369787f1dd136e75b1eedf752bfa19686cc /OpenSim/Services | |
| parent | First pass at the heart surgery for grid services. Compiles and runs minimall... (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-7253a9453e25560396e4f8c25402012b840ed0c4.zip opensim-SC_OLD-7253a9453e25560396e4f8c25402012b840ed0c4.tar.gz opensim-SC_OLD-7253a9453e25560396e4f8c25402012b840ed0c4.tar.bz2 opensim-SC_OLD-7253a9453e25560396e4f8c25402012b840ed0c4.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
3 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs index 8904461..dcf090e 100644 --- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs +++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | |||
| @@ -43,9 +43,9 @@ namespace OpenSim.Services.AuthenticationService | |||
| 43 | // | 43 | // |
| 44 | public class AuthenticationServiceBase : ServiceBase | 44 | public class AuthenticationServiceBase : ServiceBase |
| 45 | { | 45 | { |
| 46 | private static readonly ILog m_log = | 46 | // private static readonly ILog m_log = |
| 47 | LogManager.GetLogger( | 47 | // LogManager.GetLogger( |
| 48 | MethodBase.GetCurrentMethod().DeclaringType); | 48 | // MethodBase.GetCurrentMethod().DeclaringType); |
| 49 | 49 | ||
| 50 | protected IAuthenticationData m_Database; | 50 | protected IAuthenticationData m_Database; |
| 51 | 51 | ||
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index 6c99b66..d65665a 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||
| @@ -47,9 +47,9 @@ namespace OpenSim.Services.AuthenticationService | |||
| 47 | public class PasswordAuthenticationService : | 47 | public class PasswordAuthenticationService : |
| 48 | AuthenticationServiceBase, IAuthenticationService | 48 | AuthenticationServiceBase, IAuthenticationService |
| 49 | { | 49 | { |
| 50 | private static readonly ILog m_log = | 50 | // private static readonly ILog m_log = |
| 51 | LogManager.GetLogger( | 51 | // LogManager.GetLogger( |
| 52 | MethodBase.GetCurrentMethod().DeclaringType); | 52 | // MethodBase.GetCurrentMethod().DeclaringType); |
| 53 | 53 | ||
| 54 | public PasswordAuthenticationService(IConfigSource config) : | 54 | public PasswordAuthenticationService(IConfigSource config) : |
| 55 | base(config) | 55 | base(config) |
diff --git a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs index 8831c8a..d1a5b0f 100644 --- a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs | |||
| @@ -43,9 +43,9 @@ namespace OpenSim.Services.AuthenticationService | |||
| 43 | public class WebkeyAuthenticationService : | 43 | public class WebkeyAuthenticationService : |
| 44 | AuthenticationServiceBase, IAuthenticationService | 44 | AuthenticationServiceBase, IAuthenticationService |
| 45 | { | 45 | { |
| 46 | private static readonly ILog m_log = | 46 | // private static readonly ILog m_log = |
| 47 | LogManager.GetLogger( | 47 | // LogManager.GetLogger( |
| 48 | MethodBase.GetCurrentMethod().DeclaringType); | 48 | // MethodBase.GetCurrentMethod().DeclaringType); |
| 49 | 49 | ||
| 50 | public WebkeyAuthenticationService(IConfigSource config) : | 50 | public WebkeyAuthenticationService(IConfigSource config) : |
| 51 | base(config) | 51 | base(config) |