diff options
| author | Melanie | 2010-12-12 01:20:46 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-12 01:20:46 +0000 |
| commit | 8aa63093b118f257eff87c003e668249c34f5162 (patch) | |
| tree | a5ea5448482d899729c29079ed0dab8394bb9be4 /OpenSim/Framework | |
| parent | Fix border fence for physicals. Fix llRotLookAt() for Vehicles. (diff) | |
| parent | Revert "Another stab at mantis #5256" (diff) | |
| download | opensim-SC-8aa63093b118f257eff87c003e668249c34f5162.zip opensim-SC-8aa63093b118f257eff87c003e668249c34f5162.tar.gz opensim-SC-8aa63093b118f257eff87c003e668249c34f5162.tar.bz2 opensim-SC-8aa63093b118f257eff87c003e668249c34f5162.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
| -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 | { |