Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-12-12 01:20:46 +00:00
29 changed files with 351 additions and 238 deletions

View File

@@ -1845,7 +1845,7 @@ namespace OpenSim.Framework.Servers.HttpServer
/// property in StartHttp() for the HttpListener
public class HttpServerLogWriter : ILogWriter
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public void Write(object source, LogPrio priority, string message)
{