diff options
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Data/MySQL/MySQLRegionData.cs
Diffstat (limited to 'OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs')
| -rw-r--r-- | OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | 6 |
1 files changed, 3 insertions, 3 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 | ||