diff options
| author | justincc | 2010-12-15 00:35:36 +0000 |
|---|---|---|
| committer | justincc | 2010-12-15 00:35:36 +0000 |
| commit | b643661938881af6fc782d39e52040ed6d16f03f (patch) | |
| tree | 162e0667718b2f68e5f4e90cd10f30e6fa374cbb /OpenSim/Framework/Servers | |
| parent | replace ode.dll with one built without asserts turned on (diff) | |
| parent | fix mistake in last change of local.include (diff) | |
| download | opensim-SC-b643661938881af6fc782d39e52040ed6d16f03f.zip opensim-SC-b643661938881af6fc782d39e52040ed6d16f03f.tar.gz opensim-SC-b643661938881af6fc782d39e52040ed6d16f03f.tar.bz2 opensim-SC-b643661938881af6fc782d39e52040ed6d16f03f.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 3c58a7d..3343f60 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -1845,7 +1845,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 1845 | /// property in StartHttp() for the HttpListener | 1845 | /// property in StartHttp() for the HttpListener |
| 1846 | public class HttpServerLogWriter : ILogWriter | 1846 | public class HttpServerLogWriter : ILogWriter |
| 1847 | { | 1847 | { |
| 1848 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 1848 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 1849 | 1849 | ||
| 1850 | public void Write(object source, LogPrio priority, string message) | 1850 | public void Write(object source, LogPrio priority, string message) |
| 1851 | { | 1851 | { |